From: Anatol Belski <ab@php.net>
Date: Fri, 3 Oct 2014 19:45:51 +0000 (+0200)
Subject: reveal some newer libcurl features in MINFO
X-Git-Tag: PRE_PHP7_REMOVALS~89^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2161c8104df33adf8a3e20168cdf9af5f0ade88;p=php

reveal some newer libcurl features in MINFO
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index d7cacf54f9..6caaa5258b 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -556,6 +556,12 @@ PHP_MINFO_FUNCTION(curl)
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071504 /* 7.21.4 */
 			{"TLS-SRP", CURL_VERSION_TLSAUTH_SRP},
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+			{"HTTP2", CURL_VERSION_HTTP2},
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072600 /* 7.38.0 */
+			{"GSSAPI", CURL_VERSION_GSSAPI},
 #endif
 			{NULL, 0}
 		};
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt
index d82fe6f41a..3d13638f90 100644
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@@ -40,6 +40,8 @@ SPNEGO => Yes
 SSL => Yes
 SSPI => Yes
 TLS-SRP => No
+HTTP2 => No
+GSSAPI => No
 Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp
 Host => %s-pc-win32
 SSL Version => OpenSSL/%s