diff options
author | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:52:55 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:54:48 -0700 |
commit | c6384a7908976c5339374e7449e4ad5f38934e49 (patch) | |
tree | b9bff3b6810e76582640389395063956cef10796 /ext/curl/interface.c | |
parent | fce9a856e73cfb6d9a4521d5b8ea2c15417f3145 (diff) | |
parent | 1badfd8171119ef70a5d088068b9de88ba668f73 (diff) | |
download | php-git-c6384a7908976c5339374e7449e4ad5f38934e49.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
Diffstat (limited to 'ext/curl/interface.c')
-rw-r--r-- | ext/curl/interface.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ad05d56cfb..45b6bb0365 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -850,6 +850,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 */ @@ -879,6 +882,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); |