summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ruggeri <druggeri@apache.org>2017-04-10 23:23:06 +0000
committerDaniel Ruggeri <druggeri@apache.org>2017-04-10 23:23:06 +0000
commit7d2a12b86a3a6f8a998f5b19c79a0ff998d3700f (patch)
tree29a5d405fb82ddb1a95d7fffce8480e4c7805f75
parent40f2fb547c2a9cf684623401b7de20c989ea239d (diff)
downloadhttpd-7d2a12b86a3a6f8a998f5b19c79a0ff998d3700f.tar.gz
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
-rw-r--r--STATUS2
1 files changed, 1 insertions, 1 deletions
diff --git a/STATUS b/STATUS
index f22c3c8f20..e9e869e9a3 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