diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:45:01 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-10-14 11:45:01 -0700 |
| commit | 01d17228dc62ea30b7ad25835f049ccd1998b5f2 (patch) | |
| tree | 2abe6e759d8c1383dd936675248689c685ac6b1a | |
| parent | d9559d0ecd81ea09575cdbb20e908d5516cad4ad (diff) | |
| parent | 47a1447cc8b5be0b19843a21d533984803993755 (diff) | |
| download | php-git-01d17228dc62ea30b7ad25835f049ccd1998b5f2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix return code (merges are hard :( )
| -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 3a09436026..affcd02d39 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -172,7 +172,7 @@ static int php_curl_option_str(php_curl *ch, zend_long option, const char *str, 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 |