Merge ~michal-maloszewski99/ubuntu/+source/apache2:apache2-jammy-fix-proxy-hcheck into ubuntu/+source/apache2:ubuntu/jammy-devel

[Michał Małoszewski]

Unmerged commits

242c428... by Michał Małoszewski on 2022-12-15

changelog (LP: #1998311)

1578d8b... by Michał Małoszewski on 2022-12-15

Fix the mod_proxy_hcheck

mod_proxy_hcheck_jammy_fix_to_detect_support.patch: fix error which
appears while enabling mod_proxy_hcheck support for AJP/CPING.
(LP: #1998311)

diff --git a/debian/changelog b/debian/changelog
index 3c75791..d7097d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.52-1ubuntu4.3) jammy; urgency=medium
+
+  * d/p/mod_proxy_hcheck_jammy_fix_to_detect_support.patch: Fix issue
+    where enabling mod_proxy_hcheck results in error (LP: #1998311)
+
+ -- Michal Maloszewski <[e-mail]>  Thu, 15 Dec 2022 19:59:47 +0100
+
 apache2 (2.4.52-1ubuntu4.2) jammy; urgency=medium
 
   * d/p/fix-a-possible-listener-deadlock.patch,
diff --git a/debian/patches/mod_proxy_hcheck_jammy_fix_to_detect_support.patch b/debian/patches/mod_proxy_hcheck_jammy_fix_to_detect_support.patch
new file mode 100644
index 0000000..b731e3d
--- /dev/null
+++ b/debian/patches/mod_proxy_hcheck_jammy_fix_to_detect_support.patch
@@ -0,0 +1,65 @@
+From eaafacd0efc6bae4e2a9de616bf487b8a55437c1 Mon Sep 17 00:00:00 2001
+From: Eric Covener <[e-mail]>
+Date: Tue, 29 Nov 2022 13:24:16 +0000
+Subject: [PATCH] Merge r1904516 from trunk:
+Description: Fix the mod_proxy_hcheck module
+Origin: upstream, https://github.com/apache/httpd/commit/eaafacd0efc6bae4e2a9de616bf487b8a55437c1
+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=66300
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1998311
+Last-Update: 2022-12-15
+---
+ CHANGES                          |  3 +++
+ modules/proxy/mod_proxy_hcheck.c | 23 ++++++++++++-----------
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+--- a/CHANGES
++++ b/CHANGES
+@@ -1,6 +1,9 @@
+                                                          -*- coding: utf-8 -*-
+ Changes with Apache 2.4.52
+ 
++  *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
++     [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>]
++
+   *) http: Enforce that fully qualified uri-paths not to be forward-proxied
+      have an http(s) scheme, and that the ones to be forward proxied have a
+      hostname, per HTTP specifications.  [Ruediger Pluem, Yann Ylavic]
+--- a/modules/proxy/mod_proxy_hcheck.c
++++ b/modules/proxy/mod_proxy_hcheck.c
+@@ -1070,6 +1070,18 @@
+     hctp = NULL;
+     tpsize = HC_THREADPOOL_SIZE;
+ #endif
++
++    ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
++    if (ajp_handle_cping_cpong) {
++       proxy_hcmethods_t *method = proxy_hcmethods;
++       for (; method->name; method++) {
++           if (method->method == CPING) {
++               method->implemented = 1;
++               break;
++           }
++       }
++    }
++
+     return OK;
+ }
+ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
+@@ -1126,17 +1138,6 @@
+         s = s->next;
+     }
+ 
+-    ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
+-    if (ajp_handle_cping_cpong) {
+-       proxy_hcmethods_t *method = proxy_hcmethods;
+-       for (; method->name; method++) {
+-           if (method->method == CPING) {
+-               method->implemented = 1;
+-               break;
+-           }
+-       }
+-    }
+-
+     return OK;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0073887..5a90cdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ CVE-2022-30556.patch
 CVE-2022-31813.patch
 fix-a-possible-listener-deadlock.patch
 handle-children-killed-pathologically.patch
+mod_proxy_hcheck_jammy_fix_to_detect_support.patch