com php-src: reveal some newer libcurl features in MINFO: ext/curl/interface.c ext/curl/tests/check_win_config.phpt

Commit: d2161c8104df33adf8a3e20168cdf9af5f0ade88 Author: Anatol Belski <ab@php.net> Fri, 3 Oct 2014 21:45:51 +0200 Parents: c6b982a55d3edd39259fa734daf8e618cccf0d8b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d2161c8104df33adf8a3e20168cdf9af5f0ade88 Log: reveal some newer libcurl features in MINFO Changed paths: M ext/curl/interface.c M ext/curl/tests/check_win_config.phpt Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index d7cacf5..6caaa52 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -557,6 +557,12 @@ PHP_MINFO_FUNCTION(curl) #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 d82fe6f..3d13638 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