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.

diff --cc ext/curl/interface.c
index 0aa91c6a150e4e1010beb9c8cfedb44c24ba6608,0d96d1f026efd22eb36a517c3296be377117f62c..b4fac4bd9722f61f7522361219e07235a8018199
--- 1/ext/curl/interface.c
--- 2/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;