From: Stefan Eissing <icing@apache.org>
Date: Mon, 6 Jun 2016 13:29:27 +0000 (+0000)
Subject: vote
X-Git-Tag: 2.4.21~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a440c2f2ad972c9e6310e25c9e9d8c937d13548;p=thirdparty%2Fapache%2Fhttpd.git

vote

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

diff --git a/STATUS b/STATUS
index 28bc9d52f59..d1b345fc091 100644
--- a/STATUS
+++ b/STATUS
@@ -181,7 +181,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) core: save a few bytes in conf pool.
      trunk patch: http://svn.apache.org/r1744980
      2.4.x patch: trunk works
-     +1: jailletc36, 
+     +1: jailletc36, icing
 
   *) mod_proxy_(fcgi|scgi|http): save a few bytes in the request pool when this
      handler is not able to process the URL.
@@ -190,6 +190,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1744460
      2.4.x patch: trunk works
      +1: jailletc36, 
+     icing: r1744460 gives me a merge conflict. The change itself looks very
+       much ok.
 
   *) core: ASCII string comparison functions optimized speed.
      This proposal includes and renames ap_casecmpstr[n] functions available