From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 7 Sep 2021 20:17:36 +0000 (+0000)
Subject: Add logging (r1893073) to the fix for PR 63169 (keeping Eric's vote). [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~3^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db76b519c09cc691b3533f8de3e8f44c5504c044;p=thirdparty%2Fapache%2Fhttpd.git

Add logging (r1893073) to the fix for PR 63169 (keeping Eric's vote). [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893074 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 0b727327d0d..97559d96adb 100644
--- a/STATUS
+++ b/STATUS
@@ -215,7 +215,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mpm_event: Fix children processes possibly not stopped on graceful
      restart.  PR 63169
      trunk patch: http://svn.apache.org/r1893014
-     2.4.x patch: svn merge -c 1893014 ^/httpd/httpd/trunk .
+     trunk patch: http://svn.apache.org/r1893073
+     2.4.x patch: svn merge -c 1893014,1893073 ^/httpd/httpd/trunk .
      +1: ylavic, covener
 
   *) mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv