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

Proposed by Michał Małoszewski
Status: Work in progress
Proposed branch: ~michal-maloszewski99/ubuntu/+source/apache2:apache2-jammy-fix-proxy-hcheck
Merge into: ubuntu/+source/apache2:ubuntu/jammy-devel
Diff against target: 95 lines (+73/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/mod_proxy_hcheck_jammy_fix_to_detect_support.patch (+65/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+434741@code.launchpad.net
To post a comment you must log in.

Unmerged commits

242c428... by Michał Małoszewski

changelog (LP: #1998311)

1578d8b... by Michał Małoszewski

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 3c75791..d7097d9 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+apache2 (2.4.52-1ubuntu4.3) jammy; urgency=medium
7+
8+ * d/p/mod_proxy_hcheck_jammy_fix_to_detect_support.patch: Fix issue
9+ where enabling mod_proxy_hcheck results in error (LP: #1998311)
10+
11+ -- Michal Maloszewski <michal.maloszewski@canonical.com> Thu, 15 Dec 2022 19:59:47 +0100
12+
13 apache2 (2.4.52-1ubuntu4.2) jammy; urgency=medium
14
15 * d/p/fix-a-possible-listener-deadlock.patch,
16diff --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
17new file mode 100644
18index 0000000..b731e3d
19--- /dev/null
20+++ b/debian/patches/mod_proxy_hcheck_jammy_fix_to_detect_support.patch
21@@ -0,0 +1,65 @@
22+From eaafacd0efc6bae4e2a9de616bf487b8a55437c1 Mon Sep 17 00:00:00 2001
23+From: Eric Covener <covener@apache.org>
24+Date: Tue, 29 Nov 2022 13:24:16 +0000
25+Subject: [PATCH] Merge r1904516 from trunk:
26+Description: Fix the mod_proxy_hcheck module
27+Origin: upstream, https://github.com/apache/httpd/commit/eaafacd0efc6bae4e2a9de616bf487b8a55437c1
28+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=66300
29+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1998311
30+Last-Update: 2022-12-15
31+---
32+ CHANGES | 3 +++
33+ modules/proxy/mod_proxy_hcheck.c | 23 ++++++++++++-----------
34+ 2 files changed, 15 insertions(+), 11 deletions(-)
35+
36+--- a/CHANGES
37++++ b/CHANGES
38+@@ -1,6 +1,9 @@
39+ -*- coding: utf-8 -*-
40+ Changes with Apache 2.4.52
41+
42++ *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
43++ [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>]
44++
45+ *) http: Enforce that fully qualified uri-paths not to be forward-proxied
46+ have an http(s) scheme, and that the ones to be forward proxied have a
47+ hostname, per HTTP specifications. [Ruediger Pluem, Yann Ylavic]
48+--- a/modules/proxy/mod_proxy_hcheck.c
49++++ b/modules/proxy/mod_proxy_hcheck.c
50+@@ -1070,6 +1070,18 @@
51+ hctp = NULL;
52+ tpsize = HC_THREADPOOL_SIZE;
53+ #endif
54++
55++ ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
56++ if (ajp_handle_cping_cpong) {
57++ proxy_hcmethods_t *method = proxy_hcmethods;
58++ for (; method->name; method++) {
59++ if (method->method == CPING) {
60++ method->implemented = 1;
61++ break;
62++ }
63++ }
64++ }
65++
66+ return OK;
67+ }
68+ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
69+@@ -1126,17 +1138,6 @@
70+ s = s->next;
71+ }
72+
73+- ajp_handle_cping_cpong = APR_RETRIEVE_OPTIONAL_FN(ajp_handle_cping_cpong);
74+- if (ajp_handle_cping_cpong) {
75+- proxy_hcmethods_t *method = proxy_hcmethods;
76+- for (; method->name; method++) {
77+- if (method->method == CPING) {
78+- method->implemented = 1;
79+- break;
80+- }
81+- }
82+- }
83+-
84+ return OK;
85+ }
86+
87diff --git a/debian/patches/series b/debian/patches/series
88index 0073887..5a90cdf 100644
89--- a/debian/patches/series
90+++ b/debian/patches/series
91@@ -25,3 +25,4 @@ CVE-2022-30556.patch
92 CVE-2022-31813.patch
93 fix-a-possible-listener-deadlock.patch
94 handle-children-killed-pathologically.patch
95+mod_proxy_hcheck_jammy_fix_to_detect_support.patch

Subscribers

People subscribed via source and target branches