com php-src: Fix return code (merges are hard :( ): ext/curl/interface.c
| From: | Ferenc Kovacs | Date: | Wed, 15 Oct 2014 11:33:44 +0000 |
| Subject: | com php-src: Fix return code (merges are hard :( ): ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82322@lists.php.net to get a copy of this message | ||
Commit: 8d553829cc7ee052e5def4dff3c8f4e9e4f570f2
Author: Stanislav Malyshev <stas@php.net> Tue, 14 Oct 2014 11:42:33 -0700
Committer: Ferenc Kovacs <tyrael@php.net> Wed, 15 Oct 2014 13:33:44 +0200
Parents: 5818f5db624c4351210b43f465720bed83c575d8
Branches: PHP-5.6.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8d553829cc7ee052e5def4dff3c8f4e9e4f570f2
Log:
Fix return code (merges are hard :( )
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index e3e0891..9bb7676 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