From: Jim Jagielski <jim@apache.org>
Date: Thu, 2 Aug 2012 13:36:17 +0000 (+0000)
Subject: Merged in 2.4.x
X-Git-Tag: 2.5.0-alpha~6523
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b234c6edd15f8c42edfcc570e9e8c3bfd01c62b7;p=apache

Merged in 2.4.x


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

diff --git a/CHANGES b/CHANGES
index 24473a650c..090214779d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,15 +14,6 @@ Changes with Apache 2.5.0
   *) mod_lua: Move LUA_COMPAT_ALL into the right place, so it will
      activate compatibility mode for Lua 5.2. [Daniel Gruno]
 
-  *) mod_proxy: Fix memory leak or possible corruption in ProxyBlock
-     implementation.  [Ruediger Pluem, Joe Orton]
-
-  *) mod_proxy: Check hostname from request URI against ProxyBlock list,
-     not forward proxy, if ProxyRemote* is configured.  [Joe Orton]
-
-  *) mod_proxy_connect: Avoid DNS lookup on hostname from request URI 
-     if ProxyRemote* is configured.  PR 43697.  [Joe Orton]
-
   *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
      DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.  [Jeff Trawick]