summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-02-14 10:21:10 +0000
committerYann Ylavic <ylavic@apache.org>2018-02-14 10:21:10 +0000
commit33ef86145710b9b8ef06199b297384e31ecb4514 (patch)
tree4e0c86bb91eeedc8630f613cefa8773eca4b32b8
parentf4b5bd290155e99ce7088a8e9d87fed3225ec893 (diff)
downloadhttpd-33ef86145710b9b8ef06199b297384e31ecb4514.tar.gz
v3 of RemoteIPProxyProtocol.2.4 accepted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824211 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS18
1 files changed, 9 insertions, 9 deletions
diff --git a/STATUS b/STATUS
index 66443b86a6..1a4e95f103 100644
--- a/STATUS
+++ b/STATUS
@@ -119,15 +119,13 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
- [ New proposals should be added at the end of the list ]
-
*) mod_remoteip: Add PROXY protocol support
trunk patch: http://svn.apache.org/r1776575
http://svn.apache.org/r1776578 (doc fix)
+ http://svn.apache.org/r1776624
http://svn.apache.org/r1776627 (shortened name + doc fix)
http://svn.apache.org/r1776674 (attribution moved to CHANGES)
+ http://svn.apache.org/r1776734
http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
http://svn.apache.org/r1778268 (fix compiler warning)
http://svn.apache.org/r1780725 (set buckets aside)
@@ -138,20 +136,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
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)
+ http://svn.apache.org/r1790691
http://svn.apache.org/r1806985
http://svn.apache.org/r1818279
2.4 convenience patch (includes CHANGES):
- http://home.apache.org/~jim/patches/RemoteIPProxyProtocol.2.4-v2.patch
- http://svn.apache.org/r1818279
- +1: druggeri, jim
+ http://home.apache.org/~ylavic/patches/RemoteIPProxyProtocol.2.4-v3.patch
+ +1: druggeri, jim, minfrin
ylavic: RemoteIPProxyProtocol* are documented as scoped to server config
and virtual host, though using ap_server_conf makes them global
only (thus less useful too...).
jim: Can docco patch be post-backport?
minfrin: The docs seem correct, and there is a long explanation in the docs of
why the scoping is as it is.
- +1 with this to fix a warning:
- http://svn.apache.org/r1776734
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+ [ New proposals should be added at the end of the list ]
*) proxy_util: Schemes and hostnames that are "too long" are
no longer automatically fatal errors but are instead logged