From: Michael Wallner <mike@php.net>
Date: Wed, 27 Apr 2016 06:33:43 +0000 (+0200)
Subject: allow setting proxyhost request option to NULL
X-Git-Tag: RELEASE_2_6_0_BETA1~33
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=66a4a15d65841a0abcaf78a8c846489067996fa5;p=m6w6%2Fext-http

allow setting proxyhost request option to NULL

This allows to override any environment setting.
Closes issue #33
---

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 3a262a2..f28f603 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -1241,9 +1241,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 #endif
 
 	/* proxy */
-	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyhost"), CURLOPT_PROXY, IS_STRING))) {
-		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
-	}
+	php_http_option_register(registry, ZEND_STRL("proxyhost"), CURLOPT_PROXY, IS_STRING);
 	php_http_option_register(registry, ZEND_STRL("proxytype"), CURLOPT_PROXYTYPE, IS_LONG);
 	php_http_option_register(registry, ZEND_STRL("proxyport"), CURLOPT_PROXYPORT, IS_LONG);
 	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauth"), CURLOPT_PROXYUSERPWD, IS_STRING))) {