summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Ruggeri <druggeri@apache.org>2016-12-31 03:27:29 +0100
committerDaniel Ruggeri <druggeri@apache.org>2016-12-31 03:27:29 +0100
commit7f7cf96407d31b6f9e5dc8ec56f43a3f04063d78 (patch)
treec36249d55efd20bd768456388be64c492d66f909
parentDocumentation rebuild for mod_remoteip (diff)
downloadapache2-7f7cf96407d31b6f9e5dc8ec56f43a3f04063d78.tar.xz
apache2-7f7cf96407d31b6f9e5dc8ec56f43a3f04063d78.zip
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
-rw-r--r--CHANGES5
-rw-r--r--modules/metadata/mod_remoteip.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index f6025e404e..40bfa5d52d 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 8abfff73f4..7afa90d662 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"