Merge ~michal-maloszewski99/ubuntu/+source/apache2:passing-health-check-lp2003189-kinetic into ubuntu/+source/apache2:ubuntu/kinetic-devel

[Michał Małoszewski]

[Michał Małoszewski (michal-maloszewski99)]

I didn't see any merge conflicts locally so far. I'm going to fix it.

[Michał Małoszewski (michal-maloszewski99)]

I am writing SRU template which will be attached here asap.

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/?format=plain)
  apache2 @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/amd64/a/apache2/20230222_185555_d720b@/log.gz
    22.02.23 18:55:55 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/amd64/a/apache2/20230321_172447_166c8@/log.gz
    21.03.23 17:24:47 ✅ Triggers: apache2/2.4.54-2ubuntu1.2
  apache2 @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/arm64/a/apache2/20230222_164840_7d8ad@/log.gz
    22.02.23 16:48:40 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/arm64/a/apache2/20230321_111032_166c8@/log.gz
    21.03.23 11:10:32 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥
  apache2 @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/armhf/a/apache2/20230222_132953_71a4a@/log.gz
    22.02.23 13:29:53 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/armhf/a/apache2/20230321_104826_90feb@/log.gz
    21.03.23 10:48:26 ✅ Triggers: apache2/2.4.54-2ubuntu1.2
  apache2 @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/ppc64el/a/apache2/20230222_132636_2390d@/log.gz
    22.02.23 13:26:36 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/ppc64el/a/apache2/20230321_103412_90feb@/log.gz
    21.03.23 10:34:12 ✅ Triggers: apache2/2.4.54-2ubuntu1.2
  apache2 @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-apache2-ppa-kinetic-lp2003189/kinetic/s390x/a/apache2/20230222_131912_b8064@/log.gz
    22.02.23 13:19:12 ❌ Triggers: apache2/2.4.54-2ubuntu1.2
      run-test-suite FAIL 🟥

I have run the autopkgtests locally and re-tested on the same infrastructure and it looks like above.

[Michał Małoszewski (michal-maloszewski99)]

I don't see any notifications from git about conflicts. Moreover locally when I open d/changelog, the changelog stanza/version is ok.

[Michał Małoszewski (michal-maloszewski99)]

Conflict fixed on both MP's.

[Michał Małoszewski (michal-maloszewski99)]

https://docs.google.com/document/d/19e5iFyOAUvvMASm6Ox9Z4o33pJRTIf9fQ-1eO2oyvA8/edit?usp=sharing
SRU bug template

[Michał Małoszewski (michal-maloszewski99)]

Autopkgtests being run locally work, so it shows that apache2 PPA dep8 tests are fleaky.

```
welcome to localhost:8529
ok 2
500 Server closed connection without sending any data back
Content-Type: text/plain
Client-Date: Wed, 22 Mar 2023 13:34:44 GMT
Client-Warning: Internal response

Server closed connection without sending any data back at /usr/share/perl5/Net/HTTP/Methods.pm line 397.
ok 3
ok
All tests successful.
Files=142, Tests=7294, 296 wallclock secs ( 2.25 usr 0.38 sys + 178.13 cusr 51.98 csys = 232.74 CPU)
Result: PASS
[warning] server localhost:8529 shutdown
Files=142, Tests=7294, 296 wallclock secs ( 2.25 usr 0.38 sys + 178.13 cusr 51.98 csys = 232.74 CPU)
+ grep -E '^Files=[0-9]+, Tests=[0-9]+' testlog.mpm_event
+ grep -E '^Result: PASS' testlog.mpm_event
+ grep -E '^Result: FAIL' testlog.mpm_event
+ grep -E 'server dumped core' testlog.mpm_event
+ return 0
Result: PASS
autopkgtest [14:34:46]: test run-test-suite: -----------------------]
autopkgtest [14:34:47]: test run-test-suite: - - - - - - - - - - results - - - - - - - - - -
run-test-suite PASS
autopkgtest [14:34:48]: @@@@@@@@@@@@@@@@@@@@ summary
run-test-suite PASS
qemu-system-x86_64: terminating on signal 15 from pid 63458 (/usr/bin/python3)

[Bryce Harrington (bryce)]

Looks like the arm64 test still failed, but I'm going to assume that's just flaky if you can make sure to check that it builds and passes its test after uploading. Might need a rebuild/retrigger or two. That's not unusual for apache.

triage-kinetic+22.10: ~/pkg/Apache2/review-lp2003189/apache2-gu$ changes_file="../apache2_2.4.54-2ubuntu1.4_source.changes"
triage-kinetic+22.10: ~/pkg/Apache2/review-lp2003189/apache2-gu$ grep ^Vcs "${changes_file}"
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/apache2
Vcs-Git-Commit: d3a421de7af1f49866576f151a07b996c23acd21
Vcs-Git-Ref: refs/heads/passing-health-check-lp2003189-kinetic
triage-kinetic+22.10: ~/pkg/Apache2/review-lp2003189/apache2-gu$ debsponsor "${changes_file}"
 signfile dsc ../apache2_2.4.54-2ubuntu1.4.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo ../apache2_2.4.54-2ubuntu1.4.dsc ../apache2_2.4.54-2ubuntu1.4_source.buildinfo
 signfile buildinfo ../apache2_2.4.54-2ubuntu1.4_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc ../apache2_2.4.54-2ubuntu1.4.dsc ../apache2_2.4.54-2ubuntu1.4_source.changes
 fixup_changes buildinfo ../apache2_2.4.54-2ubuntu1.4_source.buildinfo ../apache2_2.4.54-2ubuntu1.4_source.changes
 signfile changes ../apache2_2.4.54-2ubuntu1.4_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files
triage-kinetic+22.10: ~/pkg/Apache2/review-lp2003189/apache2-gu$ gpg --verify "${changes_file}"
gpg: Signature made Thu 04 May 2023 02:29:22 AM UTC
gpg: using RSA key A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB
gpg: Good signature from "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
triage-kinetic+22.10: ~/pkg/Apache2/review-lp2003189/apache2-gu$ dput ubuntu "${changes_file}"
D: Setting host argument.
Checking signature on .changes
gpg: ../apache2_2.4.54-2ubuntu1.4_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../apache2_2.4.54-2ubuntu1.4.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.54-2ubuntu1.4.dsc: done.
  Uploading apache2_2.4.54-2ubuntu1.4.debian.tar.xz: done.
  Uploading apache2_2.4.54-2ubuntu1.4_source.buildinfo: done.
  Uploading apache2_2.4.54-2ubuntu1.4_source.changes: done.
Successfully uploaded packages.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, michal-maloszewski99
Uploaders: bryce
MP auto-approved

review: Approve

[Michał Małoszewski (michal-maloszewski99)]

Autopkgtests run locally work fine.

welcome to localhost:8529
ok 2
500 Server closed connection without sending any data back
Content-Type: text/plain
Client-Date: Thu, 04 May 2023 08:41:54 GMT
Client-Warning: Internal response

Server closed connection without sending any data back at /usr/share/perl5/Net/HTTP/Methods.pm line 397.
ok 3
ok
All tests successful.
Files=142, Tests=7294, 372 wallclock secs ( 2.93 usr 0.49 sys + 228.47 cusr 69.56 csys = 301.45 CPU)
Result: PASS
[warning] server localhost:8529 shutdown

grep -E '^Files=[0-9]+, Tests=[0-9]+' testlog.mpm_event
Files=142, Tests=7294, 372 wallclock secs ( 2.93 usr 0.49 sys + 228.47 cusr 69.56 csys = 301.45 CPU)
Result: PASS

grep -E '^Result: PASS' testlog.mpm_event
grep -E '^Result: FAIL' testlog.mpm_event
grep -E 'server dumped core' testlog.mpm_event
return 0
autopkgtest [10:41:56]: test run-test-suite: -----------------------]
autopkgtest [10:41:57]: test run-test-suite: - - - - - - - - - - results - - - - - - - - - -
run-test-suite PASS
autopkgtest [10:41:58]: @@@@@@@@@@@@@@@@@@@@ summary
run-test-suite PASS
qemu-system-x86_64: terminating on signal 15 from pid 10608 (/usr/bin/python3)

[Michał Małoszewski (michal-maloszewski99)]

Fixed the problem which caused the autopkgtests error in -proposed. Autopkgtests PASS.

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/?format=plain)
  apache2 @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/amd64/a/apache2/20230621_120758_8aa05@/log.gz
    21.06.23 12:07:58 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/arm64/a/apache2/20230621_131143_7c921@/log.gz
    21.06.23 13:11:43 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/armhf/a/apache2/20230621_121740_acb99@/log.gz
    21.06.23 12:17:40 ⚪ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
      No valid results
  apache2 @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/ppc64el/a/apache2/20230621_121116_9ddd4@/log.gz
    21.06.23 12:11:16 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/s390x/a/apache2/20230621_121319_8e5c7@/log.gz
    21.06.23 12:13:19 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
Running: (none)
Waiting: (none)

[Michał Małoszewski (michal-maloszewski99)]

I need to fix weird conflicts and will be ready to be sponsored.

[Michał Małoszewski (michal-maloszewski99)]

I am pretty sure that after resolving conflicts it can be uploaded and we will observe how autopkgtests behave in the -proposed.

[Bryce Harrington (bryce)]

Glad to hear you got a lead on a solution. Can you explain a bit more either here or in the bug report how MODULE_MAGIC_COOKIE caused the autopkgtest failure? Since the only change appears to be the addition of a comment, did you find some code that parses and uses that? (I haven't run into this problem with other patches so it seems a bit weird.) Also, why did this fail on Kinetic but not on Jammy?

review: Needs Information

9cc9c9b... by Michał Małoszewski on 2023-06-21

changelog (LP: #2003189)

[Michał Małoszewski (michal-maloszewski99)]

Sure, Bryce, I will explain.

11320 # Test 2 got: "126" (t/apache/mmn.t at line 42)
11321 #   Expected: "125"
11322 t/apache/mmn.t ......................·

It is a snippet of the log, I saw it, and there it came to my mind that there is a problem with that "magic number".
Btw, it was not only a comment that was changed.

Let me copy some part of the code from the Preview Diff from 3rd of May:

1. +  * 20120211.124 (2.4.51-dev) Add name_ex to struct proxy_worker_shared
2. +- *
3. ++ * 20120211.125 (2.4.55-dev) Add additional hcmethod_t enums and
                          PROXY_WORKER_IS_ERROR
4.
5. +  */
6. +
7. + #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
8. +@@ -600,7 +601,7 @@
9. + #ifndef MODULE_MAGIC_NUMBER_MAJOR
10. + #define MODULE_MAGIC_NUMBER_MAJOR 20120211
11. + #endif
12. +-#define MODULE_MAGIC_NUMBER_MINOR 124                 /* 0...n */
13. ++#define MODULE_MAGIC_NUMBER_MINOR 126                 /* 0...n */

Line number 3: * 20120211.125 (2.4.55-dev) Add additional hcmethod_t enums and
                          PROXY_WORKER_IS_ERROR
Line number 13: #define MODULE_MAGIC_NUMBER_MINOR 126                 /* 0...n */

There was a discrepancy in terms of incrementation -> 125!=126
That was an easy mistake that was not spotted.

Why did it not fail on Jammy?

1. +- *
2. ++ * 20120211.126 (2.4.55-dev) Add additional hcmethod_t enums and
3. ++                             PROXY_WORKER_IS_ERROR
4. +  */
5. +
6. + #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
7. +@@ -595,7 +596,7 @@
8. + #ifndef MODULE_MAGIC_NUMBER_MAJOR
9. + #define MODULE_MAGIC_NUMBER_MAJOR 20120211
10. + #endif
11. +-#define MODULE_MAGIC_NUMBER_MINOR 121                 /* 0...n */
12. ++#define MODULE_MAGIC_NUMBER_MINOR 126                 /* 0...n */

There we have:

Line 2  - 126
Line 12 - 126

126=126

[Michał Małoszewski (michal-maloszewski99)]

After retriggering autopkgtests - armhf passed:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/?format=plain)
  apache2 @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/amd64/a/apache2/20230621_120758_8aa05@/log.gz
    21.06.23 12:07:58 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/arm64/a/apache2/20230621_131143_7c921@/log.gz
    21.06.23 13:11:43 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/armhf/a/apache2/20230621_121740_acb99@/log.gz
    21.06.23 12:17:40 ⚪ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
      No valid results
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/armhf/a/apache2/20230621_161347_992ec@/log.gz
    21.06.23 16:13:47 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/ppc64el/a/apache2/20230621_121116_9ddd4@/log.gz
    21.06.23 12:11:16 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11
  apache2 @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-michal-maloszewski99-ppa-lp-2003189-kinetic-v2-magic-number/kinetic/s390x/a/apache2/20230621_121319_8e5c7@/log.gz
    21.06.23 12:13:19 ✅ Triggers: apache2/2.4.54-2ubuntu1.5~ppa11

I think we can think about uploading now.

[Michał Małoszewski (michal-maloszewski99)]

So tests are green

[Michał Małoszewski (michal-maloszewski99)]

I added a more concise explanation to the bug report as a comment.

[Bryce Harrington (bryce)]

$ ppa tests ppa:michal-maloszewski99/ppa-lp-2003189-kinetic-v2-magic-number
* Triggers:
  - Source apache2/2.4.54-2ubuntu1.5~ppa11: Published
    + Trigger basic @amd64♻️ Trigger all-proposed @amd64💍
    + Trigger basic @arm64♻️ Trigger all-proposed @arm64💍
    + Trigger basic @armhf♻️ Trigger all-proposed @armhf💍
    + Trigger basic @i386♻️ Trigger all-proposed @i386💍
    + Trigger basic @ppc64el♻️ Trigger all-proposed @ppc64el💍
    + Trigger basic @s390x♻️ Trigger all-proposed @s390x💍
* Results:
  - apache2/2.4.54-2ubuntu1.5~ppa11
    + ✅ apache2 on kinetic for amd64 @ 21.06.23 12:07:58 Log️ 🗒️
    + ✅ apache2 on kinetic for arm64 @ 21.06.23 13:11:43 Log️ 🗒️
    + ✅ apache2 on kinetic for armhf @ 21.06.23 12:17:40 Log️ 🗒️
    + ✅ apache2 on kinetic for armhf @ 21.06.23 16:13:47 Log️ 🗒️
    + ✅ apache2 on kinetic for ppc64el @ 21.06.23 12:11:16 Log️ 🗒️
    + ✅ apache2 on kinetic for s390x @ 21.06.23 12:13:19 Log️ 🗒️
* Running: (none)
* Waiting: (none)

Confirmed, looks good.

$ grep ^Vcs apache2_2.4.54-2ubuntu1.5_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/apache2
Vcs-Git-Commit: 9cc9c9bcdf8bf1f74c21e0029878f07f6dc8b6b8
Vcs-Git-Ref: refs/heads/passing-health-check-lp2003189-kinetic

$ dput ubuntu apache2_2.4.54-2ubuntu1.5_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: /home/bryce/pkg/Apache2/review-lp2003189/apache2_2.4.54-2ubuntu1.5_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/Apache2/review-lp2003189/apache2_2.4.54-2ubuntu1.5.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.54-2ubuntu1.5.dsc: done.
  Uploading apache2_2.4.54-2ubuntu1.5.debian.tar.xz: done.
  Uploading apache2_2.4.54-2ubuntu1.5_source.buildinfo: done.
  Uploading apache2_2.4.54-2ubuntu1.5_source.changes: done.
Successfully uploaded packages.

review: Approve

[Bryce Harrington (bryce)]

The kinetic upload got rejected but I've re-checked and I do think the upload is correct. Possibly there was confusion similar to what I had in the above "Needs Information" comment above. You probably should have stated more explicitly that the test failure is caused by a check of the number in the *comment* so the *comment* is the actual "fix" with this upload. It might be worth checking with Andreas on what the policy/process is for getting a re-look by the sru team.

[Andreas Hasenack (ahasenack)]

I see the rejection, but at some point it was also approved, but I think it never left kinetic-proposed.

In any case, this MP was then merged, so I'm marking it as such.

Rejection on july 1st:
https://launchpad.net/ubuntu/kinetic/+queue?queue_state=4&queue_text=apache2

Acceptance on july 14th, but then later removed:
Removal requested on 2023-11-13.
Published on 2023-07-14

diff --git a/debian/changelog b/debian/changelog
index e7f9c2b..ad48460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.4.54-2ubuntu1.5) kinetic; urgency=medium
+
+  * d/p/reenable-workers-in-standard-error-state-kinetic-apache2.patch:
+    fix the value discrepancy of MODULE_MAGIC_NUMBER_MINOR.
+    (LP: #2003189)
+
+ -- Michal Maloszewski <[e-mail]>  Wed, 21 Jun 2023 17:41:40 +0200
+
 apache2 (2.4.54-2ubuntu1.4) kinetic; urgency=medium
 
   * d/p/reenable-workers-in-standard-error-state-kinetic-apache2.patch:
diff --git a/debian/patches/reenable-workers-in-standard-error-state-kinetic-apache2.patch b/debian/patches/reenable-workers-in-standard-error-state-kinetic-apache2.patch
index 127a9ec..12c082c 100644
--- a/debian/patches/reenable-workers-in-standard-error-state-kinetic-apache2.patch
+++ b/debian/patches/reenable-workers-in-standard-error-state-kinetic-apache2.patch
@@ -3,10 +3,10 @@ From: Eric Covener <[e-mail]>
 Date: Mon, 9 Jan 2023 13:22:44 +0000
 Subject: [PATCH] Merge r1904518 from trunk:
 Description: Re-enable workers in standard error state
-Origin: upstream, https://github.com/apache/httpd/commit/f34e6c027bf566cef7bdb9ecd8e64a2fae69cde2
+Origin: backport, https://github.com/apache/httpd/commit/f34e6c027bf566cef7bdb9ecd8e64a2fae69cde2
 Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=66302
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/2003189
-Last-Update: 2023-02-21
+Last-Update: 2023-06-21
 ---
  CHANGES                          | 3 +++
  include/ap_mmn.h                 | 3 ++-
@@ -16,17 +16,18 @@ Last-Update: 2023-02-21
 
 --- a/include/ap_mmn.h
 +++ b/include/ap_mmn.h
-@@ -592,7 +592,8 @@
+@@ -592,7 +592,9 @@
   * 20120211.123 (2.4.51-dev) Added ap_pcre_version_string(), AP_REG_PCRE_COMPILED
   *                           and AP_REG_PCRE_LOADED to ap_regex.h.
   * 20120211.124 (2.4.51-dev) Add name_ex to struct proxy_worker_shared
 - *
-+ * 20120211.125 (2.4.55-dev) Add additional hcmethod_t enums and
-+                             PROXY_WORKER_IS_ERROR
++ * 20120211.125 (2.4.55-dev) Export mod_http2.h as public header
++ * 20120211.126 (2.4.55-dev) Backport 20120211.126 Add additional hcmethod_t enums
++                             and PROXY_WORKER_IS_ERROR
   */
  
  #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
-@@ -600,7 +601,7 @@
+@@ -600,7 +602,7 @@
  #ifndef MODULE_MAGIC_NUMBER_MAJOR
  #define MODULE_MAGIC_NUMBER_MAJOR 20120211
  #endif
@@ -37,7 +38,7 @@ Last-Update: 2023-02-21
   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
 --- a/modules/proxy/mod_proxy.h
 +++ b/modules/proxy/mod_proxy.h
-@@ -354,6 +354,8 @@ PROXY_WORKER_HC_FAIL )
+@@ -354,6 +354,8 @@
  
  #define PROXY_WORKER_IS_HCFAILED(f)   ( (f)->s->status &  PROXY_WORKER_HC_FAIL )
  
@@ -48,7 +49,7 @@ Last-Update: 2023-02-21
  /* default worker retry timeout in seconds */
 --- a/modules/proxy/mod_proxy_hcheck.c
 +++ b/modules/proxy/mod_proxy_hcheck.c
-@@ -912,7 +912,7 @@ static void * APR_THREAD_FUNC hc_check(a
+@@ -912,7 +912,7 @@
                           (int)hc->s->method);
      }
      /* what state are we in ? */