Agree with Stefan (clearing Christophe's vote).

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

diff --git a/STATUS b/STATUS
index 9e41d3c1a1e061dba58ff6c87c32f61525b56ab6..1827468dee2d46fc3669acf6d0eaf879c1fdf973 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -208,12 +208,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 maintainer mode with gcc 8.1.0
      trunk patch: http://svn.apache.org/r1831231
                   http://svn.apache.org/r1831591
-     2.4.x patch: svn merge -c 1831231,1831591 ^/httpd/httpd/trunk .
-     +1: jailletc36, ylavic,
-     -1: icing
-         this needs to be svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
-         as the orignal "gcc warnings" fix broke link header mapping,
-         with that: +1
+                  http://svn.apache.org/r1832934
+                  http://svn.apache.org/r1832937
+     2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
+     +1: ylavic, icing
 
   *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,
      zero out what had been initialized as the connection-level port.  PR59931.