summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-10-14 11:42:33 -0700
committerFerenc Kovacs <tyrael@php.net>2014-10-15 13:33:44 +0200
commit8d553829cc7ee052e5def4dff3c8f4e9e4f570f2 (patch)
tree8d26d0ad9959bf97d8a7bdb927b75a59d68e2da5
parent5818f5db624c4351210b43f465720bed83c575d8 (diff)
downloadphp-git-8d553829cc7ee052e5def4dff3c8f4e9e4f570f2.tar.gz
Fix return code (merges are hard :( )
-rw-r--r--ext/curl/interface.c2
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