diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:00 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-23 11:23:00 +0100 |
| commit | 5256ffd4fe35c2abe83d0229226324362440374e (patch) | |
| tree | dc96b87e602fe2454c28dbb79d277856fadc54db /ext/curl | |
| parent | ee2f749a22f23ac0c240de3bcc496f37785cecb9 (diff) | |
| parent | 1bfbb546f761266a769a3f1f85c26802cc7996a1 (diff) | |
| download | php-git-5256ffd4fe35c2abe83d0229226324362440374e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
curl: add new proxy constants
Diffstat (limited to 'ext/curl')
| -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 73a092abaf..ad05d56cfb 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -837,6 +837,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); |