diff options
| author | Xinchen Hui <laruence@php.net> | 2013-04-04 19:31:14 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-04 19:31:14 +0800 |
| commit | 01ca2bf8c3f694c3637a161a5d68f3c947a22c08 (patch) | |
| tree | 397156c6d26c146a536cbc2636cdb821f0a606c2 | |
| parent | aac43c9ee81b9184bfbec4ed7212d65797d6d3a3 (diff) | |
| parent | 185e5e15ae5e6d69f667dcc51205db23e0db8eb0 (diff) | |
| download | php-git-01ca2bf8c3f694c3637a161a5d68f3c947a22c08.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/curl/interface.c
| -rw-r--r-- | ext/curl/interface.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug64433.phpt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ae490b1c27..a2256ef30d 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1222,7 +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); { curl_version_info_data *info = curl_version_info(CURLVERSION_NOW); char **p = (char **)info->protocols; @@ -1237,7 +1237,7 @@ PHP_MINIT_FUNCTION(curl) } } #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); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index 87c1c7cfb4..f973768f81 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -9,7 +9,7 @@ if(!$res) { die("skip could not open cli server script"); } -if (CURL_WRAPPERS_ENABLE) { +if (CURL_WRAPPERS_ENABLED) { die("skip curl wrappers used"); } ?> |