com php-src: s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ ENABLED,: ext/curl/interface.c ext/standard/tests/str eams/bug64433.phpt

Commit: 185e5e15ae5e6d69f667dcc51205db23e0db8eb0 Author: Xinchen Hui <laruence@php.net> Thu, 4 Apr 2013 19:28:17 +0800 Parents: 4f2acd8cded99c12a9ff6ca3693978562267b6d9 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=185e5e15ae5e6d69f667dcc51205db23e0db8eb0 Log: s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, Changed paths: M ext/curl/interface.c M ext/standard/tests/streams/bug64433.phpt Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ee205a7..1f29e92 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -914,7 +914,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); @@ -942,7 +942,7 @@ PHP_MINIT_FUNCTION(curl) 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 return SUCCESS; diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index 87c1c7c..f973768 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"); } ?>