From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 6 Jun 2016 21:33:10 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.21~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9651a0de4ec5087d155b92a45fb2ab55cbf8373e;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.

(r1656259 has introduced many updates. It should be backported before trying to get r1744460)

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

diff --git a/STATUS b/STATUS
index 7e28675c3dd..4544a24ecce 100644
--- a/STATUS
+++ b/STATUS
@@ -158,15 +158,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: covener, jailletc36
 
-  *) mod_proxy_(fcgi|scgi|http): save a few bytes in the request pool when this
+  *) mod_proxy_(fcgi|scgi): save a few bytes in the request pool when this
      handler is not able to process the URL.
      trunk patch: http://svn.apache.org/r1744458
                   http://svn.apache.org/91744459
-                  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