summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-04-03 10:09:51 +0800
committerXinchen Hui <laruence@php.net>2013-04-03 10:09:51 +0800
commitd7f709a032a40cb475042b43db07a4698a2488b7 (patch)
tree6c0aa70695057365762fcc0ac0c20f440793dcea
parent7b07d05917d9ff40a70bd6ecffca840e2458ea86 (diff)
downloadphp-git-d7f709a032a40cb475042b43db07a4698a2488b7.tar.gz
Add CURL_WRAPPERS_ENABLE constant
see http://news.php.net/php.internals/66871
-rw-r--r--NEWS3
-rw-r--r--ext/curl/interface.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index ad4852d4b5..f250afa093 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 531f15ba15..ee205a707b 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;