From: Michael Wallner <mike@php.net>
Date: Fri, 23 Feb 2007 08:03:24 +0000 (+0000)
Subject: - allow setting proxy to empty string, which ignores env
X-Git-Tag: RELEASE_1_5_2~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ef7c344f6a204a4de0b31aa9b9621caad792a7fb;p=m6w6%2Fext-http

- allow setting proxy to empty string, which ignores env
---

diff --git a/http_request_api.c b/http_request_api.c
index e574eee..280302e 100644
--- 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))) {
-		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));