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 2d71f978b2235b30ee9cbbcf52a969df705b04a3..46e3f5083a5a64b2ed1a983e47ecf7ff7d4f767d 100644 (file)
--- 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>]