tests: fix http2 tests to use CRLF headers
... to make it work with nghttp2-1.49.0
This commit is contained in:
Kamil Dudka
parent
2fded2f1a8
commit
f58874c271
156
0002-curl-7.84.0-tests-http2.patch
Normal file
156
0002-curl-7.84.0-tests-http2.patch
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
From 221905eca9fb4b82822b6a14ef6d82c98c5702d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jay Satiro <raysatiro@yahoo.com>
|
||||||
|
Date: Thu, 25 Aug 2022 03:46:42 -0400
|
||||||
|
Subject: [PATCH] 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. Recent changes in nghttp2 (??? ref here)
|
||||||
|
requires curl's HTTP/1.1 test server to use CRLF headers.
|
||||||
|
|
||||||
|
Fixes https://github.com/curl/curl/issues/9364
|
||||||
|
Closes https://github.com/curl/curl/pull/9365
|
||||||
|
---
|
||||||
|
tests/data/test1700 | 34 +++++++++++++++++-----------------
|
||||||
|
tests/data/test1701 | 22 +++++++++++-----------
|
||||||
|
tests/data/test358 | 16 ++++++++--------
|
||||||
|
tests/data/test359 | 16 ++++++++--------
|
||||||
|
4 files changed, 44 insertions(+), 44 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/data/test1700 b/tests/data/test1700
|
||||||
|
index 8b1ef4ae3..7f78bcf5f 100644
|
||||||
|
--- a/tests/data/test1700
|
||||||
|
+++ b/tests/data/test1700
|
||||||
|
@@ -11,26 +11,26 @@ HTTP/2
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data nocheck="yes">
|
||||||
|
-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-
|
||||||
|
</data>
|
||||||
|
<data1>
|
||||||
|
-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-
|
||||||
|
</data1>
|
||||||
|
</reply>
|
||||||
|
diff --git a/tests/data/test1701 b/tests/data/test1701
|
||||||
|
index 3c1a2bd0b..22f6147d0 100644
|
||||||
|
--- a/tests/data/test1701
|
||||||
|
+++ b/tests/data/test1701
|
||||||
|
@@ -11,17 +11,17 @@ HTTP/2
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data nocheck="yes">
|
||||||
|
-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-
|
||||||
|
</data>
|
||||||
|
</reply>
|
||||||
|
diff --git a/tests/data/test358 b/tests/data/test358
|
||||||
|
index 8b4f66062..0f8a9801b 100644
|
||||||
|
--- a/tests/data/test358
|
||||||
|
+++ b/tests/data/test358
|
||||||
|
@@ -12,14 +12,14 @@ HTTP/2
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data nocheck="yes">
|
||||||
|
-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-
|
||||||
|
</data>
|
||||||
|
</reply>
|
||||||
|
diff --git a/tests/data/test359 b/tests/data/test359
|
||||||
|
index a5ba4e3ae..0e684e39e 100644
|
||||||
|
--- a/tests/data/test359
|
||||||
|
+++ b/tests/data/test359
|
||||||
|
@@ -12,14 +12,14 @@ HTTP/2
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data nocheck="yes">
|
||||||
|
-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-
|
||||||
|
</data>
|
||||||
|
</reply>
|
||||||
|
--
|
||||||
|
2.37.1
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.84.0
|
Version: 7.84.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Source0: https://curl.se/download/%{name}-%{version}.tar.xz
|
Source0: https://curl.se/download/%{name}-%{version}.tar.xz
|
||||||
Source1: https://curl.se/download/%{name}-%{version}.tar.xz.asc
|
Source1: https://curl.se/download/%{name}-%{version}.tar.xz.asc
|
||||||
@ -13,6 +13,9 @@ Source2: mykey.asc
|
|||||||
# easy_lock.h: include sched.h if available to fix build
|
# easy_lock.h: include sched.h if available to fix build
|
||||||
Patch1: 0001-curl-7.84.0-sched-yield.patch
|
Patch1: 0001-curl-7.84.0-sched-yield.patch
|
||||||
|
|
||||||
|
# tests: fix http2 tests to use CRLF headers to make it work with nghttp2-1.49.0
|
||||||
|
Patch2: 0002-curl-7.84.0-tests-http2.patch
|
||||||
|
|
||||||
# patch making libcurl multilib ready
|
# patch making libcurl multilib ready
|
||||||
Patch101: 0101-curl-7.32.0-multilib.patch
|
Patch101: 0101-curl-7.32.0-multilib.patch
|
||||||
|
|
||||||
@ -192,6 +195,7 @@ be installed.
|
|||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
@ -425,6 +429,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
|
|||||||
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
|
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 25 2022 Kamil Dudka <kdudka@redhat.com> - 7.84.0-3
|
||||||
|
- tests: fix http2 tests to use CRLF headers to make it work with nghttp2-1.49.0
|
||||||
|
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.84.0-2
|
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.84.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user