diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-05-25 08:31:08 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-25 23:05:27 +0200 |
| commit | d844f2b9ff50cfa7bf7f5b445d9f7eed7e6c3015 (patch) | |
| tree | a5f27cbc6044fbda72db97a033d0e53a340b4c18 /tests/unit | |
| parent | 308c243db5b7425b454a981d4c0eb7bfac374b8b (diff) | |
| download | curl-d844f2b9ff50cfa7bf7f5b445d9f7eed7e6c3015.tar.gz | |
altsvc: fix parser for lines ending with CRLF
Fixed the alt-svc parser to treat a newline as end of line.
The unit tests in test 1654 were done without CRLF and thus didn't quite
match the real world. Now they use CRLF as well.
Reported-by: Peter Wu
Assisted-by: Peter Wu
Assisted-by: Jay Satiro
Fixes #5445
Closes #5446
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/unit1654.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c index d05d0b214..e1475289d 100644 --- a/tests/unit/unit1654.c +++ b/tests/unit/unit1654.c @@ -63,7 +63,7 @@ UNITTEST_START fail_unless(asi->num == 4, "wrong number of entries"); msnprintf(outname, sizeof(outname), "%s-out", arg); - result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"", + result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:8080\"\r\n", ALPN_h1, "example.org", 8080); if(result) { fprintf(stderr, "Curl_altsvc_parse() failed!\n"); @@ -71,7 +71,7 @@ UNITTEST_START } fail_unless(asi->num == 5, "wrong number of entries"); - result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"", + result = Curl_altsvc_parse(curl, asi, "h3=\":8080\"\r\n", ALPN_h1, "2.example.org", 8080); if(result) { fprintf(stderr, "Curl_altsvc_parse(2) failed!\n"); @@ -80,7 +80,7 @@ UNITTEST_START fail_unless(asi->num == 6, "wrong number of entries"); result = Curl_altsvc_parse(curl, asi, - "h2=\"example.com:8080\", h3=\"yesyes.com\"", + "h2=\"example.com:8080\", h3=\"yesyes.com\"\r\n", ALPN_h1, "3.example.org", 8080); if(result) { fprintf(stderr, "Curl_altsvc_parse(3) failed!\n"); @@ -89,7 +89,8 @@ UNITTEST_START /* that one should make two entries */ fail_unless(asi->num == 8, "wrong number of entries"); - result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:443\"; ma = 120;", + result = Curl_altsvc_parse(curl, asi, + "h2=\"example.com:443\"; ma = 120;\r\n", ALPN_h2, "example.org", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(4) failed!\n"); @@ -98,7 +99,8 @@ UNITTEST_START fail_unless(asi->num == 9, "wrong number of entries"); /* quoted 'ma' value */ - result = Curl_altsvc_parse(curl, asi, "h2=\"example.net:443\"; ma=\"180\";", + result = Curl_altsvc_parse(curl, asi, + "h2=\"example.net:443\"; ma=\"180\";\r\n", ALPN_h2, "example.net", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(4) failed!\n"); @@ -106,9 +108,10 @@ UNITTEST_START } fail_unless(asi->num == 10, "wrong number of entries"); - result = Curl_altsvc_parse(curl, asi, - "h2=\":443\", h3=\":443\"; ma = 120; persist = 1", - ALPN_h1, "curl.haxx.se", 80); + result = + Curl_altsvc_parse(curl, asi, + "h2=\":443\", h3=\":443\"; ma = 120; persist = 1\r\n", + ALPN_h1, "curl.haxx.se", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(5) failed!\n"); unitfail++; @@ -116,7 +119,7 @@ UNITTEST_START fail_unless(asi->num == 12, "wrong number of entries"); /* clear that one again and decrease the counter */ - result = Curl_altsvc_parse(curl, asi, "clear;", + result = Curl_altsvc_parse(curl, asi, "clear;\r\n", ALPN_h1, "curl.haxx.se", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(6) failed!\n"); |