From: Eric Covener <covener@apache.org>
Date: Wed, 11 Aug 2021 10:50:43 +0000 (+0000)
Subject: add apr15 compat [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bf39ef5c616e88ac712533b6cb8a56a1f10e16e;p=thirdparty%2Fapache%2Fhttpd.git

add apr15 compat [skip ci]


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

diff --git a/STATUS b/STATUS
index 6f4b44f116d..8f41372bc39 100644
--- a/STATUS
+++ b/STATUS
@@ -268,8 +268,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
  *) core: ap_timeout_parameter_parse UBI fuzz fix followup
     trunk patch: http://svn.apache.org/r1892185
-    svn merge -c 1892185 ^/httpd/httpd/trunk .
-    +1: covener, jailletc36, 
+    trunk patch: http://svn.apache.org/r1892207
+    svn merge -c 1892185,1892207 ^/httpd/httpd/trunk .
+    +1: covener
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]