From: Masaki Kagaya <masakielastic@gmail.com>
Date: Sun, 22 Mar 2015 23:10:06 +0000 (+0900)
Subject: add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
X-Git-Tag: php-5.5.24RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1badfd8171119ef70a5d088068b9de88ba668f73;p=php

add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
---

diff --git a/NEWS b/NEWS
index ae6c25a8f4..f2ddfeba93 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ PHP                                                                        NEWS
   . Fixed bug #69221 (Segmentation fault when using a generator in combination
     with an Iterator). (Nikita)
 
+- Curl:
+  . Implemented FR#69278 (HTTP2 support). (Masaki Kagaya)
+
 - Enchant:
   . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
     builds). (Anatol)
diff --git a/UPGRADING b/UPGRADING
index 0ddd276197..7b51ae5e92 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -408,6 +408,7 @@ None
 - cURL:
   - Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
   - Added CURL_WRAPPERS_ENABLED to reflect --with-curlwrappers.
+  - Added CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 in 5.5.24+.
 
 - GD
   - Added constants for imageflip:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8e593f54ba..195912c54e 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -858,6 +858,9 @@ PHP_MINIT_FUNCTION(curl)
 	/* Curl Http Version constants (CURLOPT_HTTP_VERSION) */
 	REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
 	REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+	REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_2_0);
+#endif
 	REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
 
 	/* Curl Lock constants */
@@ -887,6 +890,9 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
 	REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
 	REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+	REGISTER_CURL_CONSTANT(CURL_VERSION_HTTP2);
+#endif
 
 #if LIBCURL_VERSION_NUM >= 0x070a06 /* Available since 7.10.6 */
 	REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);