From 70c5280d0529544e654a5fbb17f30086cb618679 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 12:41:25 -0500 Subject: [PATCH] Import rpm: 8b11eeb3c4e58475c99828fdf3a7875cb95e3188 --- mod_http2-1.15.7-SNI.patch | 25 +++++++++++++++++++++++++ mod_http2.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 mod_http2-1.15.7-SNI.patch diff --git a/mod_http2-1.15.7-SNI.patch b/mod_http2-1.15.7-SNI.patch new file mode 100644 index 0000000..5410aa3 --- /dev/null +++ b/mod_http2-1.15.7-SNI.patch @@ -0,0 +1,25 @@ +commit 0686f5d00a4b5a54238a1979f8e61d179adf2ea9 +Author: Tomas Korbar +Date: Thu Sep 22 14:56:24 2022 +0200 + + Backport refactor of SNI feature + +diff --git a/mod_http2/mod_proxy_http2.c b/mod_http2/mod_proxy_http2.c +index 83ae431..2208707 100644 +--- a/mod_http2/mod_proxy_http2.c ++++ b/mod_http2/mod_proxy_http2.c +@@ -403,14 +403,6 @@ run_connect: + */ + apr_table_setn(ctx->p_conn->connection->notes, + "proxy-request-alpn-protos", "h2"); +- if (ctx->p_conn->ssl_hostname) { +- ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctx->owner, +- "set SNI to %s for (%s)", +- ctx->p_conn->ssl_hostname, +- ctx->p_conn->hostname); +- apr_table_setn(ctx->p_conn->connection->notes, +- "proxy-request-hostname", ctx->p_conn->ssl_hostname); +- } + } + + if (ctx->master->aborted) goto cleanup; diff --git a/mod_http2.spec b/mod_http2.spec index 2665178..2f1d8bc 100644 --- a/mod_http2.spec +++ b/mod_http2.spec @@ -3,7 +3,7 @@ Name: mod_http2 Version: 1.15.7 -Release: 5%{?dist} +Release: 7%{?dist} Summary: module implementing HTTP/2 for Apache 2 Group: System Environment/Daemons License: ASL 2.0 @@ -13,8 +13,10 @@ Patch1: mod_http2-1.15.7-CVE-2020-9490.patch Patch2: mod_http2-1.15.7-CVE-2020-11993.patch Patch3: mod_http2-1.15.7-CVE-2021-33193.patch Patch4: mod_http2-1.15.7-CVE-2021-44224.patch +Patch5: mod_http2-1.15.7-SNI.patch BuildRequires: pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2 Requires: httpd-mmn = %{_httpd_mmn} +Requires: httpd >= 2.4.37-47 Conflicts: httpd < 2.4.25-8 @@ -28,6 +30,7 @@ top of libnghttp2 for httpd 2.4 servers. %patch2 -p1 -b .CVE-2020-11993 %patch3 -p1 -b .CVE-2021-33193 %patch4 -p1 -b .CVE-2021-44224 +%patch5 -p1 -b .SNI %build %configure @@ -54,6 +57,13 @@ make check %{_httpd_moddir}/mod_proxy_http2.so %changelog +* Thu Dec 08 2022 Luboš Uhliarik - 1.15.7-7 +- Resolves: #2095650 - Dependency from mod_http2 on httpd broken + +* Tue Nov 01 2022 Tomas Korbar - 1.15.7-6 +- Backport SNI feature refactor +- Resolves: rhbz#2137257 + * Mon Jan 24 2022 Luboš Uhliarik - 1.15.7-5 - Resolves: #2035030 - CVE-2021-44224 httpd:2.4/httpd: possible NULL dereference or SSRF in forward proxy configurations diff --git a/sources b/sources index efd918d..054e823 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_http2-1.15.7.tar.gz) = effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228 +SHA1 (mod_http2-1.15.7.tar.gz) = 6f52107e47548eee1c45c3fc7a7ca2245a115dd8