Commit:    d7f709a032a40cb475042b43db07a4698a2488b7
Author:    Xinchen Hui <larue...@php.net>         Wed, 3 Apr 2013 10:09:51 +0800
Parents:   7b07d05917d9ff40a70bd6ecffca840e2458ea86
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=d7f709a032a40cb475042b43db07a4698a2488b7

Log:
Add CURL_WRAPPERS_ENABLE constant

see http://news.php.net/php.internals/66871

Changed paths:
  M  NEWS
  M  ext/curl/interface.c


Diff:
diff --git a/NEWS b/NEWS
index ad4852d..f250afa 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ PHP                                                             
           NEWS
   . Fixed bug #64433 (follow_location parameter of context is ignored for most 
     response codes). (Sergey Akbarov)
 
+- CURL
+  . Add CURL_WRAPPERS_ENABLE constant. (Laruence)
+
 ?? ??? 2013, PHP 5.4.14
 - Core:
   . Fixed bug #64529 (Ran out of opcode space). (Dmitry)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 531f15b..ee205a7 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -914,6 +914,7 @@ PHP_MINIT_FUNCTION(curl)
        }
 
 #ifdef PHP_CURL_URL_WRAPPERS
+       REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS | 
CONST_PERSISTENT);
 # if HAVE_CURL_VERSION_INFO
        {
                curl_version_info_data *info = 
curl_version_info(CURLVERSION_NOW);
@@ -940,6 +941,8 @@ PHP_MINIT_FUNCTION(curl)
        php_unregister_url_stream_wrapper("ldap");
        php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC);
 # endif
+#else
+       REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS | 
CONST_PERSISTENT);
 #endif
 
        return SUCCESS;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to