Commit: 6ace9c646b56707723f44c9fa6a46a907e1292f3 Author: Xinchen Hui <larue...@php.net> Wed, 3 Apr 2013 10:15:41 +0800 Parents: 688f5fc8897fe505de80640a75a290338bf5c2fb 78a9489f6a7326dd0ce0c2baaf37c94a0a85f931 Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ace9c646b56707723f44c9fa6a46a907e1292f3 Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: ext/curl/interface.c Changed paths: MM ext/curl/interface.c Diff: diff --cc ext/curl/interface.c index 0c29e46,ee205a7..ae490b1 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@@ -1222,6 -914,8 +1222,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); char **p = (char **)info->protocols; @@@ -1235,10 -929,22 +1236,12 @@@ (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 + #else + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS | CONST_PERSISTENT); #endif + curlfile_register_class(TSRMLS_C); + return SUCCESS; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
