clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
Conflicts:
	ext/curl/interface.c
This commit is contained in:
Xinchen Hui 2013-04-04 19:31:14 +08:00
commit 01ca2bf8c3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/curl/interface.c
View File

@ -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);

2
ext/standard/tests/streams/bug64433.phpt
View File

@ -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");
}
?>