com php-src: FIX #71831: CURLOPT_NOPROXY applied as lon g instead of string: ext/curl/interface.c
| From: | Xinchen Hui | Date: | Fri, 18 Mar 2016 12:29:01 +0000 |
| Subject: | com php-src: FIX #71831: CURLOPT_NOPROXY applied as lon g instead of string: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91440@lists.php.net to get a copy of this message | ||
Commit: efacdc3511c14f3200b31765bd0113da443e66ad
Author: Michael Sierks <michael.sierks@priceline.com> Fri, 18 Mar 2016 07:29:01
-0500
Parents: ddc62f2e8b07217d1593610db29f2ea85b7adb1f
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=efacdc3511c14f3200b31765bd0113da443e66ad
Log:
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.
Bugs:
https://bugs.php.net/71831
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 98cc5e2..19d8bb0 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 */