]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
add apr15 compat [skip ci]
authorEric Covener <covener@apache.org>
Wed, 11 Aug 2021 10:50:43 +0000 (10:50 +0000)
committerEric Covener <covener@apache.org>
Wed, 11 Aug 2021 10:50:43 +0000 (10:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892208 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 6f4b44f116d6be6b24daea94293432efe4134d06..8f41372bc396892da763a5f52701dbda1e94f223 100644 (file)
--- 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 ]