diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:43:34 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:43:34 -0700 |
| commit | 47a1447cc8b5be0b19843a21d533984803993755 (patch) | |
| tree | 4971d8864ac64cc587348e7e4ec843aeafc2c7b7 /ext/curl | |
| parent | 3e4cef131e503072d6dbb8b406db01fe5e00aefd (diff) | |
| parent | bb3d43fa05be3c0ae46b5bcc92d2933b00d92d11 (diff) | |
| download | php-git-47a1447cc8b5be0b19843a21d533984803993755.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix return code (merges are hard :( )
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index e3e089175f..9bb767624c 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -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 |