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 f6025e404e9fe3e7f5131c44c98e3451a5fe6d50..40bfa5d52d3236b4b1a9e509ee777fa0f1d1c07b 100644 (file)
--- 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 8abfff73f42037aabe73ba9e5acf8b0ca6af8a5e..7afa90d662af9b22a2a9dc3690629419bb7c4094 100644 (file)
--- 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"