From: Jim Jagielski <jim@apache.org>
Date: Tue, 20 Feb 2007 17:07:12 +0000 (+0000)
Subject: Note PR 11540 closed here and in httpd-2.2
X-Git-Tag: 2.3.0~1901
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1085ebaccb7e4ae40f90672e794043869b84f4;p=thirdparty%2Fapache%2Fhttpd.git

Note PR 11540 closed here and in httpd-2.2


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

diff --git a/CHANGES b/CHANGES
index 2d71f978b22..46e3f5083a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -251,6 +251,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) mod_proxy: Fix some proxy setting inheritance problems (eg:
+     ProxyTimeout). PR 11540. [Stuart Children <stuart terminus.co.uk>]
+
   *) Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
      can work after that terminating signal.
      [Eric Covener <covener gmail.com>]