diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:57 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:57 +0100 |
| commit | 09c43bd398fcb87737b6d44b6d79ee22b366eb4c (patch) | |
| tree | 24e2ce96e7d90a40f33c9d9f68a1680dca7cd227 | |
| parent | 4f399a7c365a7c424ddbd973f059e0e77b334811 (diff) | |
| parent | caacaee6813da80f0803e311c47fa74c8a695daa (diff) | |
| download | php-git-09c43bd398fcb87737b6d44b6d79ee22b366eb4c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
updated NEWS
curl: add new proxy constants
| -rw-r--r-- | ext/curl/interface.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 4354dcdb2f..b2e3447c4e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -844,6 +844,11 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4); REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5); +#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */ + REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4A); + REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5_HOSTNAME); +#endif + /* Curl Share constants */ REGISTER_CURL_CONSTANT(CURLSHOPT_NONE); REGISTER_CURL_CONSTANT(CURLSHOPT_SHARE); |