diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:39:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:39:22 +0800 |
| commit | 056459dc9dad6982cbd3a0832cab611c4ac41e0f (patch) | |
| tree | 5a06d060ee65575c7580788113797b049d4f0d1c | |
| parent | cc3cdd00578006a5684e6dfaf81532a13326b9fe (diff) | |
| parent | efacdc3511c14f3200b31765bd0113da443e66ad (diff) | |
| download | php-git-056459dc9dad6982cbd3a0832cab611c4ac41e0f.tar.gz | |
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
* 'PHP-5.6' of https://github.com/msierks/php-src:
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |