From 4e773c1b92c5db328fbbca36e566a1c76957be63 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 28 Apr 2013 22:25:40 -0700 Subject: [PATCH] Revert "Add CURL_WRAPPERS_ENABLE constant" This reverts commit d7f709a032a40cb475042b43db07a4698a2488b7. Since wrappers are deleted from 5.5, no point in adding this constant. --- NEWS | 3 --- ext/curl/interface.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/NEWS b/NEWS index 3d37baf5b15..2527cfce9d2 100644 --- a/NEWS +++ b/NEWS @@ -11,9 +11,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 1f29e9280d9..531f15ba15f 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;