From: Linus Unnebäck <linus@folkdatorn.se>
Date: Tue, 17 Jun 2014 10:28:44 +0000 (+0200)
Subject: curl: add new proxy constants
X-Git-Tag: php-5.5.23RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63ab6d8249c9f5d04fc29ed2fb3908ce6594e5f7;p=php

curl: add new proxy constants
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 56cc51c453..8e593f54ba 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -845,6 +845,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);