summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2017-05-27 22:21:29 +0200
committerEric Covener <covener@apache.org>2017-05-27 22:21:29 +0200
commite43ae8cfd682ea171efe2ca48126fc8149a9babc (patch)
tree9847a76424711b15daec33297f3d63a405190d14
parentctr'ed in 1796447. (diff)
downloadapache2-e43ae8cfd682ea171efe2ca48126fc8149a9babc.tar.xz
apache2-e43ae8cfd682ea171efe2ca48126fc8149a9babc.zip
these are backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796451 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES8
1 files changed, 0 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES
index 9d8833f4f4..fe14268a92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,11 +35,6 @@ Changes with Apache 2.5.0
a possible crash if a signal is caught during (graceful) restart.
PR 60487. [Yann Ylavic]
- *) mod_proxy: Allow the per-request environment variable "no-proxy" to
- be used as an alternative to ProxyPass /path !. This is primarily
- to set exceptions for ProxyPass specified in <Location> context.
- Use SetEnvIf, not SetEnv. [Eric Covener]
-
*) When using mod_status with the Event MPM, report the number of requests
associated with an active connection in the "ACC" field. Previously
zero was always reported with this MPM. PR60647. [Eric Covener]
@@ -52,9 +47,6 @@ Changes with Apache 2.5.0
specified so these kinds of fixups can be restored without impacting
FPM. PR60576 [Eric Covener, Jim Jagielski]
- *) core: EBCDIC fixes for interim responses with additional headers.
- [Eric Covener]
-
*) 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