pierrick Wed, 14 Dec 2011 03:45:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=321001
Log:
Remove dead code
# curl_version_info was introduced in 7.10 and the PHP requirement is 7.10.5
Changed paths:
U php/php-src/trunk/ext/curl/config.m4
U php/php-src/trunk/ext/curl/config.w32
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/trunk/ext/curl/config.m4
===================================================================
--- php/php-src/trunk/ext/curl/config.m4 2011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/config.m4 2011-12-14 03:45:44 UTC (rev
321001)
@@ -131,13 +131,6 @@
$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,[ ])
Modified: php/php-src/trunk/ext/curl/config.w32
===================================================================
--- php/php-src/trunk/ext/curl/config.w32 2011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/config.w32 2011-12-14 03:45:44 UTC (rev
321001)
@@ -18,7 +18,6 @@
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]');
Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c 2011-12-14 03:31:55 UTC (rev
321000)
+++ php/php-src/trunk/ext/curl/interface.c 2011-12-14 03:45:44 UTC (rev
321001)
@@ -1141,7 +1141,6 @@
}
#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 @@
(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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
