!15 update mod_http2 to 2.0.20
From: @eaglegai Reviewed-by: @kircher Signed-off-by: @kircher
This commit is contained in:
commit
0dbfe89e9a
@ -1,34 +0,0 @@
|
|||||||
From 071c00d2edd14ea573f8e4b2c1a827a26de01749 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Eissing <stefan@eissing.org>
|
|
||||||
Date: Thu, 16 Feb 2023 14:45:12 +0100
|
|
||||||
Subject: [PATCH] Workaround for building with older httpd versions that lack
|
|
||||||
ap_thread_create().
|
|
||||||
|
|
||||||
---
|
|
||||||
mod_http2/h2_workers.c | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/mod_http2/h2_workers.c b/mod_http2/h2_workers.c
|
|
||||||
index e7e2039..192dbc0 100644
|
|
||||||
--- a/mod_http2/h2_workers.c
|
|
||||||
+++ b/mod_http2/h2_workers.c
|
|
||||||
#The source of this patch is https://github.com/icing/mod_h2/commit/071c00d2edd14ea573f8e4b2c1a827a26de01749
|
|
||||||
#The reason for joining this patch is that the version released by the native community has not modified this content,
|
|
||||||
#and the modified version has not been released.
|
|
||||||
@@ -131,8 +131,13 @@ static apr_status_t activate_slot(h2_workers *workers)
|
|
||||||
apr_pool_tag(pool, "h2_worker_slot");
|
|
||||||
slot->pool = pool;
|
|
||||||
|
|
||||||
+#if defined(AP_HAS_THREAD_LOCAL)
|
|
||||||
rv = ap_thread_create(&slot->thread, workers->thread_attr,
|
|
||||||
slot_run, slot, slot->pool);
|
|
||||||
+#else
|
|
||||||
+ rv = apr_thread_create(&slot->thread, workers->thread_attr,
|
|
||||||
+ slot_run, slot, slot->pool);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
if (rv != APR_SUCCESS) {
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From 3e88d4b98a35634cd3eafa04e9ffb48b767e4d02 Mon Sep 17 00:00:00 2001
|
||||||
|
From: eaglegai <eaglegai@163.com>
|
||||||
|
Date: Fri, 21 Jul 2023 07:54:22 +0800
|
||||||
|
Subject: [PATCH] fix compilation error when using
|
||||||
|
PROXY_CANONENC_NOENCODEDSLASHENCODING
|
||||||
|
|
||||||
|
---
|
||||||
|
mod_http2/mod_proxy_http2.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mod_http2/mod_proxy_http2.c b/mod_http2/mod_proxy_http2.c
|
||||||
|
index 8c0905f9..6e24dde4 100644
|
||||||
|
--- a/mod_http2/mod_proxy_http2.c
|
||||||
|
+++ b/mod_http2/mod_proxy_http2.c
|
||||||
|
@@ -158,8 +158,8 @@ static int proxy_http2_canon(request_rec *r, char *url)
|
||||||
|
search = r->args;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
+#ifdef PROXY_CANONENC_NOENCODEDSLASHENCODING
|
||||||
|
core_dir_config *d = ap_get_core_module_config(r->per_dir_config);
|
||||||
|
- #ifdef PROXY_CANONENC_NOENCODEDSLASHENCODING
|
||||||
|
int flags = d->allow_encoded_slashes && !d->decode_encoded_slashes ? PROXY_CANONENC_NOENCODEDSLASHENCODING : 0;
|
||||||
|
|
||||||
|
path = ap_proxy_canonenc_ex(r->pool, url, (int)strlen(url),
|
||||||
Binary file not shown.
BIN
mod_http2-2.0.20.tar.gz
Normal file
BIN
mod_http2-2.0.20.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,14 @@
|
|||||||
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
|
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
|
||||||
|
|
||||||
Name: mod_http2
|
Name: mod_http2
|
||||||
Version: 2.0.11
|
Version: 2.0.20
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Support for the HTTP/2 transport layer
|
Summary: Support for the HTTP/2 transport layer
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://icing.github.io/mod_h2/
|
URL: https://icing.github.io/mod_h2/
|
||||||
Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
patch0: Solution-to-version-building.patch
|
patch0: backport-fix-build-errors-without-PROXY_CANONENC_NOENCODEDSLA.patch
|
||||||
|
|
||||||
BuildRequires: make gcc pkgconfig httpd-devel >= 2.4.20 libnghttp2-devel >= 1.7.0 openssl-devel >= 1.0.2 autoconf libtool hostname
|
BuildRequires: make gcc pkgconfig httpd-devel >= 2.4.20 libnghttp2-devel >= 1.7.0 openssl-devel >= 1.0.2 autoconf libtool hostname
|
||||||
Requires: httpd-mmn = %{_httpd_mmn}
|
Requires: httpd-mmn = %{_httpd_mmn}
|
||||||
@ -50,6 +50,12 @@ make check
|
|||||||
%exclude /etc/httpd/share/doc/*
|
%exclude /etc/httpd/share/doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 21 2023 gaihuiying <eaglegai@163.com> - 2.0.20-1
|
||||||
|
- Type:requirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: update mod_http2 to 2.0.20
|
||||||
|
|
||||||
* Mon Feb 20 2023 li-long315 <lilong@kylinos.cn> - 2.0.11-1
|
* Mon Feb 20 2023 li-long315 <lilong@kylinos.cn> - 2.0.11-1
|
||||||
- Type:Update
|
- Type:Update
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user