From: Stefan Eissing <icing@apache.org>
Date: Thu, 4 Apr 2019 13:30:07 +0000 (+0000)
Subject: vote
X-Git-Tag: 2.4.40~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e6bbe9d786158b595405ca87144ae88b59c1543;p=thirdparty%2Fapache%2Fhttpd.git

vote

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

diff --git a/STATUS b/STATUS
index c670411d613..9d04ebbd31e 100644
--- a/STATUS
+++ b/STATUS
@@ -133,6 +133,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1856297 ^/httpd/httpd/trunk .
      +1: icing, jim, ylavic
 
+  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
+     a non-fatal warning/error under maintainer-mode.
+     trunk patch: http://svn.apache.org/r1850745
+                  http://svn.apache.org/r1855446
+     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
+     +1: jim, covener, icing
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -183,13 +189,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: at least, r1853302 is required, IMHO
      minfrin: r1853302 is added in above, resetting jim's vote
 
-  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
-     a non-fatal warning/error under maintainer-mode.
-     trunk patch: http://svn.apache.org/r1850745
-                  http://svn.apache.org/r1855446
-     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
-     +1: jim, covener
-
   *) mod_proxy_http: forward 100-continue, and minimize race conditions when
      reusing backend connections. PR 60330.
      trunk patch: http://svn.apache.org/r1656259