From aa98c66e503934a1b633420ccceda12e2001bd52 Mon Sep 17 00:00:00 2001 From: xquery Date: Sun, 19 Apr 2020 19:12:28 +0200 Subject: [PATCH] add more alt-svc test coverage --- tests/data/Makefile.inc | 3 +- tests/data/test358 | 94 +++++++++++++++++++++++++++++++++++++++++ tests/data/test359 | 94 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 tests/data/test358 create mode 100644 tests/data/test359 diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index aabe1e6d9..099940410 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -59,7 +59,8 @@ test316 test317 test318 test319 test320 test321 test322 test323 test324 \ test325 test326 test327 test328 test329 test330 test331 test332 test333 \ test334 test335 test336 test337 test338 test339 test340 test341 test342 \ test343 test344 test345 \ -test350 test351 test352 test353 test354 test355 test356 test357 \ +test350 test351 test352 test353 test354 test355 test356 test357 test358 \ +test359 \ test393 test394 test395 \ \ test400 test401 test402 test403 test404 test405 test406 test407 test408 \ diff --git a/tests/data/test358 b/tests/data/test358 new file mode 100644 index 000000000..27cf967c9 --- /dev/null +++ b/tests/data/test358 @@ -0,0 +1,94 @@ + + + +HTTP +HTTP GET +Alt-Svc +HTTP/2 + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes +Alt-Svc: h2=":9014", ma=315360000; persist=0 + +-foo- + + + +# +# Client-side + + +alt-svc +debug + + +http +http/2 + + +HTTPS GET translated by alt-svc lookup to HTTP/2 GET + + +# make debug-curl accept Alt-Svc over plain HTTP +CURL_ALTSVC_HTTP="yeah" + + +--http2 --alt-svc "log/altsvc-358" "http://%HOSTIP:%HTTPPORT/358" "http://%HOSTIP:%HTTPPORT/358" + + +h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0 + + + + +# +# Verify data after the test has been "shot" + + +HTTP/1.1 101 Switching Protocols +Connection: Upgrade +Upgrade: h2c + +HTTP/2 200 +date: Thu, 09 Nov 2010 14:49:00 GMT +content-length: 6 +content-type: text/html +funny-head: yesyes +alt-svc: h2=":9014", ma=315360000; persist=0 +server: nghttpx +via: 1.1 nghttpx + +-foo- +HTTP/2 200 +date: Thu, 09 Nov 2010 14:49:00 GMT +content-length: 6 +content-type: text/html +funny-head: yesyes +alt-svc: h2=":9014", ma=315360000; persist=0 +server: nghttpx +via: 1.1 nghttpx + +-foo- + + +# strip out the (dynamic) expire date from the file so that the rest +# matches +s/\"2([^\"]*)\"/TIMESTAMP/ + + +# Your alt-svc cache. https://curl.haxx.se/docs/alt-svc.html +# This file was generated by libcurl! Edit at your own risk. +h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0 + + + diff --git a/tests/data/test359 b/tests/data/test359 new file mode 100644 index 000000000..945131ca3 --- /dev/null +++ b/tests/data/test359 @@ -0,0 +1,94 @@ + + + +HTTPS +HTTPS GET +Alt-Svc +HTTP/2 + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes +Alt-Svc: h2=":9014", ma=315360000; persist=0 + +-foo- + + + +# +# Client-side + + +alt-svc +debug + + +https +http/2 + + +HTTPS GET translated by alt-svc lookup to HTTP/2 GET + + +# make debug-curl accept Alt-Svc over plain HTTP +CURL_ALTSVC_HTTP="yeah" + + +--http2 --alt-svc "log/altsvc-359" "http://%HOSTIP:%HTTPSPORT/359" "http://%HOSTIP:%HTTPSPORT/359" + + +h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0 + + + + +# +# Verify data after the test has been "shot" + + +HTTP/1.1 101 Switching Protocols +Connection: Upgrade +Upgrade: h2c + +HTTP/2 200 +date: Thu, 09 Nov 2010 14:49:00 GMT +content-length: 6 +content-type: text/html +funny-head: yesyes +alt-svc: h2=":9014", ma=315360000; persist=0 +server: nghttpx +via: 1.1 nghttpx + +-foo- +HTTP/2 200 +date: Thu, 09 Nov 2010 14:49:00 GMT +content-length: 6 +content-type: text/html +funny-head: yesyes +alt-svc: h2=":9014", ma=315360000; persist=0 +server: nghttpx +via: 1.1 nghttpx + +-foo- + + +# strip out the (dynamic) expire date from the file so that the rest +# matches +s/\"2([^\"]*)\"/TIMESTAMP/ + + +# Your alt-svc cache. https://curl.haxx.se/docs/alt-svc.html +# This file was generated by libcurl! Edit at your own risk. +h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0 + + +