From efacdc3511c14f3200b31765bd0113da443e66ad Mon Sep 17 00:00:00 2001 From: Michael Sierks Date: Fri, 18 Mar 2016 07:29:01 -0500 Subject: FIX #71831: CURLOPT_NOPROXY applied as long instead of string The CURLOPT_NOPROXY option value is converted to a long before being applied as a curl option. This causes the option to have no effect. This patch changes this conversion to a string. --- ext/curl/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/interface.c') diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 98cc5e2bb4..19d8bb02b5 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2223,7 +2223,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue TSRMLS_DC) case CURLOPT_CERTINFO: #endif #if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */ - case CURLOPT_NOPROXY: case CURLOPT_PROTOCOLS: case CURLOPT_REDIR_PROTOCOLS: case CURLOPT_SOCKS5_GSSAPI_NEC: @@ -2305,6 +2304,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue TSRMLS_DC) case CURLOPT_USERNAME: #endif #if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */ + case CURLOPT_NOPROXY: case CURLOPT_SOCKS5_GSSAPI_SERVICE: #endif #if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */ -- cgit v1.2.1