From 536f5f442e779b29ff2f28cd26a847058cdd6ed1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 13 Dec 2015 09:24:08 +0100 Subject: 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. --- 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 +++-- 9 files changed, 27 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/data/test1400 b/tests/data/test1400 index 72989c4c4..be458bd98 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 d10cac26d..6144bd82d 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 c3bf834bd..00395fc3c 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 3ec7dd032..85188d8f8 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 441569752..0f59c496c 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 38bfd5c54..5868afa58 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 c80459f95..8c6de5c1a 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 e84463a3e..8ec9b441e 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 79ca675a7..8894045d4 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/ -- cgit v1.2.1