From 69b3ff5118be4eb6fdd9ef645b955cac7d2fe0ba Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Aug 2019 20:10:27 +0200 Subject: alt-svc: add protocol version selection masking So that users can mask in/out specific HTTP versions when Alt-Svc is used. - Removed "h2c" and updated test case accordingly - Changed how the altsvc struct is laid out - Added ifdefs to make the unittest run even in a quiche-tree Closes #4201 --- tests/data/test1654 | 6 +++--- tests/unit/unit1654.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/data/test1654 b/tests/data/test1654 index 175076c8a..5b32cb419 100644 --- a/tests/data/test1654 +++ b/tests/data/test1654 @@ -32,7 +32,7 @@ unit1654 h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 # a comment -h2c example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 +h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 h1 example.com 443 h3 shiny.example.com 8443 "20121231 00:00:01" 0 1 h3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 1 # also a comment @@ -45,14 +45,14 @@ rubbish # Your alt-svc cache. https://curl.haxx.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 -h2c example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 +h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 h1 example.com 443 h3 shiny.example.com 8443 "20121231 00:00:01" 0 1 h3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 1 h1 example.org 8080 h2 example.com 8080 "20190125 22:34:21" 0 0 h1 2.example.org 8080 h3 2.example.org 8080 "20190125 22:34:21" 0 0 h1 3.example.org 8080 h2 example.com 8080 "20190125 22:34:21" 0 0 h1 3.example.org 8080 h3 yesyes.com 8080 "20190125 22:34:21" 0 0 -h2c example.org 80 h2 example.com 443 "20190124 22:36:21" 0 0 +h2 example.org 80 h2 example.com 443 "20190124 22:36:21" 0 0 diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c index 9d1a3e211..51fc5d16f 100644 --- a/tests/unit/unit1654.c +++ b/tests/unit/unit1654.c @@ -90,7 +90,7 @@ UNITTEST_START fail_unless(asi->num == 8, "wrong number of entries"); result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:443\"; ma = 120;", - ALPN_h2c, "example.org", 80); + ALPN_h2, "example.org", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(4) failed!\n"); unitfail++; -- cgit v1.2.3