- allow setting proxy to empty string, which ignores env

diff --git a/http_request_api.c b/http_request_api.c
index e574eee870f908239c0168e3c650f263a81a5130..280302e99ccd92dcbcdd6931003e8c0ccf16bedc 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -481,9 +481,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* proxy */
        if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
 
        /* proxy */
        if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {

-               if (Z_STRLEN_P(zoption)) {
-                       HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
-               }
+               HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));

                /* type */
                if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) {
                        HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));
                /* type */
                if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) {
                        HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));