diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-03 10:15:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-03 10:15:41 +0800 |
| commit | 6ace9c646b56707723f44c9fa6a46a907e1292f3 (patch) | |
| tree | f8be35d393df7ada9be405b80d0e2f50c33ec961 | |
| parent | 688f5fc8897fe505de80640a75a290338bf5c2fb (diff) | |
| parent | 78a9489f6a7326dd0ce0c2baaf37c94a0a85f931 (diff) | |
| download | php-git-6ace9c646b56707723f44c9fa6a46a907e1292f3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
| -rw-r--r-- | ext/curl/interface.c | 3 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug64433.phpt | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 0c29e4613e..ae490b1c27 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1222,6 +1222,7 @@ PHP_MINIT_FUNCTION(curl) } #ifdef PHP_CURL_URL_WRAPPERS + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 1, CONST_CS | CONST_PERSISTENT); { curl_version_info_data *info = curl_version_info(CURLVERSION_NOW); char **p = (char **)info->protocols; @@ -1235,6 +1236,8 @@ PHP_MINIT_FUNCTION(curl) (void) *p++; } } +#else + REGISTER_LONG_CONSTANT("CURL_WRAPPERS_ENABLE", 0, CONST_CS | CONST_PERSISTENT); #endif curlfile_register_class(TSRMLS_C); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index a1bf2196af..87c1c7cfb4 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -9,10 +9,7 @@ if(!$res) { die("skip could not open cli server script"); } -ob_start(); -phpinfo(); -$curlwrappers = preg_match("/with-curlwrappers/", ob_get_clean()); -if ($curlwrappers) { +if (CURL_WRAPPERS_ENABLE) { die("skip curl wrappers used"); } ?> |