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.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Fix return code (merges are hard :( )
This commit is contained in:
Stanislav Malyshev 2014-10-14 11:43:34 -07:00
commit 47a1447cc8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/curl/interface.c
View File

@ -171,7 +171,7 @@ static int php_curl_option_str(php_curl *ch, long option, const char *str, const
if (strlen(str) != len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Curl option contains invalid characters (\\0)");
return 0;
return FAILURE;
}
#if LIBCURL_VERSION_NUM >= 0x071100