com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c
| From: | Xinchen Hui | Date: | Thu, 04 Apr 2013 11:31:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71858@lists.php.net to get a copy of this message | ||
Commit: 01ca2bf8c3f694c3637a161a5d68f3c947a22c08
Author: Xinchen Hui <laruence@php.net> Thu, 4 Apr 2013 19:31:14 +0800
Parents: aac43c9ee81b9184bfbec4ed7212d65797d6d3a3 185e5e15ae5e6d69f667dcc51205db23e0db8eb0
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01ca2bf8c3f694c3637a161a5d68f3c947a22c08
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 ae490b1,1f29e92..a2256ef
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1222,7 -914,8 +1222,7 @@@ PHP_MINIT_FUNCTION(curl
}
#ifdef PHP_CURL_URL_WRAPPERS
- REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS | CONST_PERSISTENT);
+ 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);
char **p = (char **)info->protocols;
@@@ -1236,12 -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);
+ REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLED", 0, CONST_CS | CONST_PERSISTENT);
#endif
+ curlfile_register_class(TSRMLS_C);
+
return SUCCESS;
}
/* }}} */