diff options
| -rw-r--r-- | ext/curl/config.m4 | 7 | ||||
| -rw-r--r-- | ext/curl/config.w32 | 1 | ||||
| -rw-r--r-- | ext/curl/interface.c | 13 |
3 files changed, 0 insertions, 21 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 19d3e59c47..92559be7c4 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -131,13 +131,6 @@ int main(int argc, char *argv[]) $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ]) - PHP_CHECK_LIBRARY(curl,curl_version_info, - [ - AC_DEFINE(HAVE_CURL_VERSION_INFO,1,[ ]) - ],[],[ - $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR - ]) - PHP_CHECK_LIBRARY(curl,curl_easy_strerror, [ AC_DEFINE(HAVE_CURL_EASY_STRERROR,1,[ ]) diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index 0d18318288..a056845575 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -18,7 +18,6 @@ if (PHP_CURL != "no") { AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL'); AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have curl_easy_strerror in cURL'); AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have curl_multi_strerror in cURL'); - AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info in cURL'); ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB"); // TODO: check for curl_version_info // AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers [experimental]'); diff --git a/ext/curl/interface.c b/ext/curl/interface.c index b3b799f8ee..7c3c5a7975 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1141,7 +1141,6 @@ PHP_MINIT_FUNCTION(curl) } #ifdef PHP_CURL_URL_WRAPPERS -# if HAVE_CURL_VERSION_INFO { curl_version_info_data *info = curl_version_info(CURLVERSION_NOW); char **p = (char **)info->protocols; @@ -1155,18 +1154,6 @@ PHP_MINIT_FUNCTION(curl) (void) *p++; } } -# else - php_unregister_url_stream_wrapper("http"); - php_register_url_stream_wrapper("http", &php_curl_wrapper TSRMLS_CC); - php_unregister_url_stream_wrapper("https"); - php_register_url_stream_wrapper("https", &php_curl_wrapper TSRMLS_CC); - php_unregister_url_stream_wrapper("ftp"); - php_register_url_stream_wrapper("ftp", &php_curl_wrapper TSRMLS_CC); - php_unregister_url_stream_wrapper("ftps"); - php_register_url_stream_wrapper("ftps", &php_curl_wrapper TSRMLS_CC); - php_unregister_url_stream_wrapper("ldap"); - php_register_url_stream_wrapper("ldap", &php_curl_wrapper TSRMLS_CC); -# endif #endif return SUCCESS; |