From: Daniel Ruggeri <druggeri@apache.org>
Date: Mon, 10 Apr 2017 23:23:06 +0000 (+0000)
Subject: Update proposal to include fix by jailletc36 - update convenience patch, too
X-Git-Tag: 2.4.26~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2a12b86a3a6f8a998f5b19c79a0ff998d3700f;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal to include fix by jailletc36 - update convenience patch, too

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

diff --git a/STATUS b/STATUS
index f22c3c8f206..e9e869e9a30 100644
--- a/STATUS
+++ b/STATUS
@@ -169,13 +169,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1788674 (final edge cases/ignore slave conns)
                   http://svn.apache.org/r1789800 (remove optional processing)
                   http://svn.apache.org/r1790169 (rename "exception" directive)
+                  http://svn.apache.org/r1790457 (Update directive name in err message)
      2.4 convenience patch (includes CHANGES):
                   http://people.apache.org/~druggeri/patches/RemoteIPProxyProtocol.2.4.x.patch
      +1: druggeri, jim
      -0.5: wrowe (Still reviewing support of unwise 'optional' schema vs. other
                   possibile solves; questioning reading-but-ignoring PROXY
                   protocol input, also seems unwise)
-      jailletc36: needs r1790457 but can be merged afterwards. No functionnal change.
 
   *) mod_brotli: Backport of mod_brotli filter
      trunk patch: http://svn.apache.org/r1761714