From 536f5f442e779b29ff2f28cd26a847058cdd6ed1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 13 Dec 2015 09:24:08 +0100 Subject: [PATCH] curl: use 2TLS by default Make this the default for the curl tool (if built with HTTP/2 powers enabled) unless a specific HTTP version is requested on the command line. This should allow more users to get HTTP/2 powers without having to change anything. --- src/tool_operate.c | 4 +++- src/tool_setopt.c | 2 ++ tests/data/test1400 | 5 +++-- tests/data/test1401 | 5 +++-- tests/data/test1402 | 5 +++-- tests/data/test1403 | 5 +++-- tests/data/test1404 | 5 +++-- tests/data/test1405 | 5 +++-- tests/data/test1406 | 5 +++-- tests/data/test1407 | 5 +++-- tests/data/test1420 | 5 +++-- 11 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/tool_operate.c b/src/tool_operate.c index d5177d92b58016..e5506c6fa99569 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -956,9 +956,11 @@ static CURLcode operate_do(struct GlobalConfig *global, /* new in libcurl 7.5 */ my_setopt(curl, CURLOPT_MAXREDIRS, config->maxredirs); - /* new in libcurl 7.9.1 */ if(config->httpversion) my_setopt_enum(curl, CURLOPT_HTTP_VERSION, config->httpversion); + else if(curlinfo->features & CURL_VERSION_HTTP2) { + my_setopt_enum(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); + } /* new in libcurl 7.10.6 (default is Basic) */ if(config->authtype) diff --git a/src/tool_setopt.c b/src/tool_setopt.c index e11f527ac443ca..ff8d40719175f4 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -70,6 +70,8 @@ const NameValue setopt_nv_CURL_HTTP_VERSION[] = { NV(CURL_HTTP_VERSION_NONE), NV(CURL_HTTP_VERSION_1_0), NV(CURL_HTTP_VERSION_1_1), + NV(CURL_HTTP_VERSION_2_0), + NV(CURL_HTTP_VERSION_2TLS), NVEND, }; diff --git a/tests/data/test1400 b/tests/data/test1400 index 72989c4c4a807e..be458bd9825840 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -46,10 +46,11 @@ Accept: */* s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1401 b/tests/data/test1401 index d10cac26da19c8..6144bd82d33346 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -53,10 +53,11 @@ X-Men: cyclops, iceman -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1402 b/tests/data/test1402 index c3bf834bde30a3..00395fc3c9474e 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -51,10 +51,11 @@ foo=bar&baz=quux # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1403 b/tests/data/test1403 index 3ec7dd032fd790..85188d8f87baa7 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -48,10 +48,11 @@ Accept: */* # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1404 b/tests/data/test1404 index 441569752b2e3f..0f59c496ca6051 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -83,10 +83,11 @@ dummy data # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1405 b/tests/data/test1405 index 38bfd5c54d50e4..5868afa582e5df 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -127,10 +127,11 @@ int main(int argc, char *argv[]) # support, IOW depends on configuration - just ignore these. $_ = '' if /CURLOPT_USERAGENT/ $_ = '' if /CURLOPT_MAXREDIRS/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1406 b/tests/data/test1406 index c80459f95b77ea..8c6de5c1a039b4 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -116,10 +116,11 @@ int main(int argc, char *argv[]) # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1407 b/tests/data/test1407 index e84463a3e57dc5..8ec9b441e245b0 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -94,10 +94,11 @@ int main(int argc, char *argv[]) # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/ diff --git a/tests/data/test1420 b/tests/data/test1420 index 79ca675a7bf884..8894045d4962ee 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -99,10 +99,11 @@ int main(int argc, char *argv[]) # curl's default user-agent varies with version, libraries etc. s/(USERAGENT, \")[^\"]+/${1}stripped/ -# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just -# ignore them +# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with +# configurations - just ignore them $_ = '' if /CURLOPT_SSL_VERIFYPEER/ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ +$_ = '' if /CURLOPT_HTTP_VERSION/