From: Jay Satiro Date: Thu, 25 Aug 2022 07:46:42 +0000 (-0400) Subject: tests: fix http2 tests to use CRLF headers X-Git-Tag: curl-7_85_0~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef121401d6eabed204a716f16b2776ededc75c0e;p=thirdparty%2Fcurl.git tests: fix http2 tests to use CRLF headers Prior to this change some tests that rely on nghttpx proxy did not use CRLF headers everywhere. A recent change in nghttp2, which updated its version of llhttp (HTTP parser), requires curl's HTTP/1.1 test server to use CRLF headers. Ref: https://github.com/nghttp2/nghttp2/commit/9d389e8 Fixes https://github.com/curl/curl/issues/9364 Closes https://github.com/curl/curl/pull/9365 --- diff --git a/tests/data/test1700 b/tests/data/test1700 index 8b1ef4ae33..7f78bcf5f9 100644 --- a/tests/data/test1700 +++ b/tests/data/test1700 @@ -11,26 +11,26 @@ HTTP/2 # Server-side -HTTP/1.1 200 OK -Date: Tue, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake -Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT -ETag: "21025-dc7-39462498" -Accept-Ranges: bytes -Content-Length: 6 -Connection: close -Content-Type: text/html -Funny-head: yesyes - +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + -foo- -HTTP/1.1 200 OK -Date: Tue, 09 Nov 2010 14:49:00 GMT -Content-Length: 6 -Connection: close -Content-Type: text/html - +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Content-Type: text/html + -maa- diff --git a/tests/data/test1701 b/tests/data/test1701 index 3c1a2bd0b8..22f6147d05 100644 --- a/tests/data/test1701 +++ b/tests/data/test1701 @@ -11,17 +11,17 @@ HTTP/2 # Server-side -HTTP/1.1 200 OK -Date: Tue, 09 Nov 2010 14:49:00 GMT -Server: test-server/fake -Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT -ETag: "21025-dc7-39462498" -Accept-Ranges: bytes -Content-Length: 6 -Connection: close -Content-Type: text/html -Funny-head: yesyes - +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + -foo- diff --git a/tests/data/test358 b/tests/data/test358 index 8b4f660624..0f8a9801bb 100644 --- a/tests/data/test358 +++ b/tests/data/test358 @@ -12,14 +12,14 @@ HTTP/2 # Server-side -HTTP/1.1 200 OK -Date: Tue, 09 Nov 2010 14:49:00 GMT -Content-Length: 6 -Connection: close -Content-Type: text/html -Funny-head: yesyes -Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0 - +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes +Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0 + -foo- diff --git a/tests/data/test359 b/tests/data/test359 index a5ba4e3ae0..0e684e39e5 100644 --- a/tests/data/test359 +++ b/tests/data/test359 @@ -12,14 +12,14 @@ HTTP/2 # Server-side -HTTP/1.1 200 OK -Date: Tue, 09 Nov 2010 14:49:00 GMT -Content-Length: 6 -Connection: close -Content-Type: text/html -Funny-head: yesyes -Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0 - +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes +Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0 + -foo-