From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 28 Feb 2014 11:01:17 +0000 (+0800)
Subject: Merge branch '5.5' into 5.6
X-Git-Tag: php-5.6.0beta1~3^2~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbb2dc07881691ce783b3367e5470583a3e10a36;p=php

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.
---

cbb2dc07881691ce783b3367e5470583a3e10a36
diff --cc ext/curl/interface.c
index 0aa91c6a15,0d96d1f026..b4fac4bd97
--- 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;