Skip to content

Commit 1badfd8

Browse files
masakielasticsmalyshev
authored andcommitted
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
1 parent 723ffe2 commit 1badfd8

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ PHP NEWS
1616
. Fixed bug #69221 (Segmentation fault when using a generator in combination
1717
with an Iterator). (Nikita)
1818

19+
- Curl:
20+
. Implemented FR#69278 (HTTP2 support). (Masaki Kagaya)
21+
1922
- Enchant:
2023
. Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
2124
builds). (Anatol)

UPGRADING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ None
408408
- cURL:
409409
- Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
410410
- Added CURL_WRAPPERS_ENABLED to reflect --with-curlwrappers.
411+
- Added CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 in 5.5.24+.
411412

412413
- GD
413414
- Added constants for imageflip:

ext/curl/interface.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,9 @@ PHP_MINIT_FUNCTION(curl)
858858
/* Curl Http Version constants (CURLOPT_HTTP_VERSION) */
859859
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
860860
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
861+
#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
862+
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_2_0);
863+
#endif
861864
REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
862865

863866
/* Curl Lock constants */
@@ -887,6 +890,9 @@ PHP_MINIT_FUNCTION(curl)
887890
REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
888891
REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
889892
REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
893+
#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
894+
REGISTER_CURL_CONSTANT(CURL_VERSION_HTTP2);
895+
#endif
890896

891897
#if LIBCURL_VERSION_NUM >= 0x070a06 /* Available since 7.10.6 */
892898
REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);

0 commit comments

Comments
 (0)