diff options
author | Stanislav Malyshev <stas@php.net> | 2013-04-28 22:25:40 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-04-28 22:29:45 -0700 |
commit | 1d6a1fb5c87bc60fd0def2e2d32a2c4f4ad15fc0 (patch) | |
tree | e7df7b570b60d82816b45402f8eb384f9d1f4802 | |
parent | efe8f3f74de6f587edb2a73e18a7399ac41b5836 (diff) | |
download | php-git-1d6a1fb5c87bc60fd0def2e2d32a2c4f4ad15fc0.tar.gz |
Revert "Add CURL_WRAPPERS_ENABLE constant"
This reverts commit d7f709a032a40cb475042b43db07a4698a2488b7.
Since wrappers are deleted from 5.5, no point in adding this constant.
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | ext/curl/interface.c | 3 |
2 files changed, 0 insertions, 6 deletions
@@ -9,9 +9,6 @@ PHP NEWS response codes). (Sergey Akbarov) . Fixed bugs #47675 and #64577 (fd leak on Solaris) -- CURL: - . Add CURL_WRAPPERS_ENABLED constant. (Laruence) - - Fileinfo: . Upgraded libmagic to 5.14. (Anatol) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 1f29e9280d..531f15ba15 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -914,7 +914,6 @@ PHP_MINIT_FUNCTION(curl) } #ifdef PHP_CURL_URL_WRAPPERS - REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLED", 1, CONST_CS | CONST_PERSISTENT); # if HAVE_CURL_VERSION_INFO { curl_version_info_data *info = curl_version_info(CURLVERSION_NOW); @@ -941,8 +940,6 @@ 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_ENABLED", 0, CONST_CS | CONST_PERSISTENT); #endif return SUCCESS; |