com php-src: Merge branch '5.5' into 5.6: ext/curl/interface.c
| From: | Tjerk Anne Meesters | Date: | Fri, 28 Feb 2014 11:01:17 +0000 |
| Subject: | com php-src: Merge branch '5.5' into 5.6: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76270@lists.php.net to get a copy of this message | ||
Commit: cbb2dc07881691ce783b3367e5470583a3e10a36
Author: Tjerk Meesters <datibbaw@php.net> Fri, 28 Feb 2014 19:01:17 +0800
Parents: 1cb4398ac1354911fc56217856cef4aa25aa32c4 9443fb999d35abedbd12e7c3340ae756cc1f9298
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cbb2dc07881691ce783b3367e5470583a3e10a36
Log:
Merge branch '5.5' into 5.6
* 5.5:
Fixed expected output of a few cURL test cases
Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
Changed paths:
MM ext/curl/interface.c
Diff:
diff --cc ext/curl/interface.c
index 0aa91c6,0d96d1f..b4fac4b
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -2502,11 -2504,9 +2499,10 @@@ static int _php_curl_setopt(php_curl *c
if (PG(open_basedir) && *PG(open_basedir)) {
if (Z_LVAL_PP(zvalue) != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated
when an open_basedir is set");
- RETVAL_FALSE;
- return 1;
+ return FAILURE;
}
}
+#endif
error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
break;