diff options
| author | Masaki Kagaya <masakielastic@gmail.com> | 2015-03-23 08:10:06 +0900 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:52:42 -0700 |
| commit | 1badfd8171119ef70a5d088068b9de88ba668f73 (patch) | |
| tree | d486cf31662ea4e6b5ccd7b3271bb996b1ab5e33 | |
| parent | 723ffe2e896f3546b666ba1b1ee677c404a8cf45 (diff) | |
| download | php-git-1badfd8171119ef70a5d088068b9de88ba668f73.tar.gz | |
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | UPGRADING | 1 | ||||
| -rw-r--r-- | ext/curl/interface.c | 6 |
3 files changed, 10 insertions, 0 deletions
@@ -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) @@ -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); |