add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2

diff --git a/NEWS b/NEWS
index ae6c25a8f42b3b1beff03777f9219e288942a1b7..f2ddfeba93659f3ba9b6df1b4efba0475c2a79c7 100644 (file)
--- 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 0ddd276197abd1c9356c285a41d2dba0639ee304..7b51ae5e922a93aeaeee81fe573aa0e42e1ca86b 100644 (file)
--- 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 8e593f54ba0ef625e04e120ccb3ed639ab4542f0..195912c54e4f205f4713943b9bd996e2b965bc0a 100644 (file)
--- 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);