Tweaks for 2.4.23

- changelog
- add new *.load files
- drop obsolete ap_get_useragent_host_modperl_crash.patch
- explicitly enable mod_proxy_http2 and mod_proxy_fdpass

5 files changed, 6 insertions, 17 deletions

diff --git a/debian/config-dir/mods-available/proxy_hcheck.load b/debian/config-dir/mods-available/proxy_hcheck.load
new file mode 100644
index 00000000..b70f421c
--- /dev/null
+++ b/debian/config-dir/mods-available/proxy_hcheck.load
@@ -0,0 +1,2 @@
+# Depends: proxy
+LoadModule proxy_hcheck_module /usr/lib/apache2/modules/mod_proxy_hcheck.so
diff --git a/debian/config-dir/mods-available/proxy_http2.load b/debian/config-dir/mods-available/proxy_http2.load
new file mode 100644
index 00000000..b251d0c5
--- /dev/null
+++ b/debian/config-dir/mods-available/proxy_http2.load
@@ -0,0 +1,2 @@
+# Depends: proxy http2
+LoadModule proxy_http2_module /usr/lib/apache2/modules/mod_proxy_http2.so
diff --git a/debian/patches/ap_get_useragent_host_modperl_crash.patch b/debian/patches/ap_get_useragent_host_modperl_crash.patch
deleted file mode 100644
index 2a3ec3d6..00000000
--- a/debian/patches/ap_get_useragent_host_modperl_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# http://svn.apache.org/viewvc?view=revision&revision=1742135
---- apache2.orig/server/core.c
-+++ apache2/server/core.c
-@@ -966,7 +966,10 @@ AP_DECLARE(const char *) ap_get_useragen
-     int hostname_lookups;
-     int ignored_str_is_ip;
- 
--    if (r->useragent_addr == conn->client_addr) {
-+    /* Guard here when examining the host before the read_request hook
-+     * has populated an r->useragent_addr
-+     */
-+    if (!r->useragent_addr || (r->useragent_addr == conn->client_addr)) {
-         return ap_get_remote_host(conn, r->per_dir_config, type, str_is_ip);
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index d73c0879..4a1b9140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,5 @@ reproducible_builds.diff
 
 # This patch is applied manually
 #suexec-custom.patch
-ap_get_useragent_host_modperl_crash.patch
+
 fix_logresolve_segfault.patch
diff --git a/debian/rules b/debian/rules
index cf656a6e..b754534c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ override_dh_auto_configure: generate-maintainer-scripts prebuild-checks support/
 		--with-pcre=yes \
 		--enable-pie \
 		--enable-mpms-shared=all \
-		--enable-mods-shared="all cgi ident authnz_fcgi imagemap cern_meta" \
+		--enable-mods-shared="all cgi ident authnz_fcgi imagemap cern_meta proxy_fdpass proxy_http2" \
 		--enable-mods-static="unixd logio watchdog version" \
 		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
 		LTFLAGS="$(AP2_LTFLAGS)" SHELL=/bin/bash