summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2015-09-04 17:59:06 +0200
committerKalle Sommer Nielsen <kalle@php.net>2015-09-04 17:59:06 +0200
commitfbfceaaa5d7854b9fae5a67d00c9b9a11f2bad08 (patch)
tree606a9b11e4e9dc83840c55fba26483eefe86760f
parent4481be5d266be78270b8ed687908adbb4ce66a5f (diff)
parent9ec6a44c5e9f98974c3cad5a95af7b8a5c544616 (diff)
downloadphp-git-fbfceaaa5d7854b9fae5a67d00c9b9a11f2bad08.tar.gz
Merge branch 'pull-request/1497'
-rw-r--r--ext/curl/interface.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 5081127649..f12a9e2492 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1217,6 +1217,12 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2);
#endif
+#if LIBCURL_VERSION_NUM >= 0x072B00 /* Available since 7.43.0 */
+ REGISTER_CURL_CONSTANT(CURLPIPE_NOTHING);
+ REGISTER_CURL_CONSTANT(CURLPIPE_HTTP1);
+ REGISTER_CURL_CONSTANT(CURLPIPE_MULTIPLEX);
+#endif
+
#if CURLOPT_FTPASCII != 0
REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
#endif