From: Daniel Ruggeri <druggeri@apache.org>
Date: Sat, 31 Dec 2016 02:27:29 +0000 (+0000)
Subject: Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES
X-Git-Tag: 2.5.0-alpha~842
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f7cf96407d31b6f9e5dc8ec56f43a3f04063d78;p=thirdparty%2Fapache%2Fhttpd.git

Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776674 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index f6025e404e9..40bfa5d52d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_remoteip: Add support for PROXY protocol (code donated by Cloudzilla).
+     Add ability for PROXY protocol processing to be optional to donated code.
+     See also: http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
+     [Cloudzilla/roadrunner2@GitHub, Jim Jagielski, Daniel Ruggeri]
+
   *) mod_rewrite: When a substitution is a fully qualified URL, and the 
      scheme/host/port matches the current virtual host, stop interpreting the 
      path component as a local path just because the first component of the 
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 8abfff73f42..7afa90d662a 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -12,9 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * The majority of the input filter code for PROXY protocol support is
- * Copyright 2014 Cloudzilla Inc.
  */
 
 #include "ap_config.h"