From: Jim Jagielski <jim@apache.org>
Date: Wed, 29 Nov 2017 14:59:56 +0000 (+0000)
Subject: The updated PROXY protocol support patchset
X-Git-Tag: 2.4.30~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3935bc603d7c5862d87b1b820f6e59ef1506d4e7;p=apache

The updated PROXY protocol support patchset


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

diff --git a/STATUS b/STATUS
index 4847c88d24..8ae94da739 100644
--- a/STATUS
+++ b/STATUS
@@ -164,18 +164,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1790457 (Update directive name in err message)
                   http://svn.apache.org/r1806985
      2.4 convenience patch (includes CHANGES):
-                  http://home.apache.org/~jim/patches/RemoteIPProxyProtocol.2.4.x.patch
-                  http://svn.apache.org/r1806985
+                  http://home.apache.org/~jim/patches/RemoteIPProxyProtocol.2.4-v2.patch
      +1: druggeri, jim
-     mrumph: I had a chance to review this proposal.
-             I committed some suggested changes to trunk in r1806985.
-             Also, the copyright in mod_remoteip.c is of some concern.
-             Perhaps the terms of the copyright should be included in that note.
-             And on a personal note, today is my last day with Oracle.
-             So it may well be my last day with Apache as well.
-             It has been great working with all of you.
-        jim: Not sure what the copyright concern is, but added r1806985
-             to the proposal.
      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...).