diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:43:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:43:55 +0800 |
| commit | ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278 (patch) | |
| tree | 83aea41d43adbd126a80ded2772ef10a4f3a4a1b /ext/curl/interface.c | |
| parent | 65ae7440b026440835f6fdc5d19ea9e0fde41436 (diff) | |
| parent | c9c8e70463f61e15de36c00462debb8894b5511a (diff) | |
| download | php-git-ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS for efacdc3
FIX #71831: CURLOPT_NOPROXY applied as long instead of string
Diffstat (limited to 'ext/curl/interface.c')
| -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 0a7f7c72e8..b157175c3e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2149,7 +2149,6 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ 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: @@ -2240,6 +2239,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ 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 */ |