From: Stefan Eissing <icing@apache.org>
Date: Wed, 6 Jun 2018 09:25:44 +0000 (+0000)
Subject: vote
X-Git-Tag: 2.4.34~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=574075a2cf4a1c6db21e57091427c5522d658858;p=apache

vote

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

diff --git a/STATUS b/STATUS
index ed10a42f86..b845c2cb48 100644
--- a/STATUS
+++ b/STATUS
@@ -228,6 +228,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   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
 
   *) mod_remoteip: When overriding the useragent address from X-Forwarded-For,
      zero out what had been initialized as the connection-level port.  PR59931.