Hopefully this is it... not sure what's going on with my

OS X box: svn merge is acting wonky

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696451 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 45933452fda8b29004fa921e6a817751c3aa5a65..e1c6e75dbca81abdb6f7074269515cff87b091b8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,9 +15,9 @@ Changes with Apache 2.2.10
   *) mod_charset_lite: Avoid dropping error responses by handling meta buckets
      correctly. PR 45687 [Dan Poirier <poirier pobox.com>]
 
-  *) mod_proxy: Add connectiontimeout parameter for proxy workers in order to
-     be able to set the timeout for connecting to the backend separately.
-     PR 45445. [Ruediger Pluem, rahul <rahul sun.com>]
+  *) mod_proxy_http: Introduce environment variable proxy-initial-not-pooled to
+     avoid reusing pooled connections if the client connection is an initial
+     connection. PR 37770. [Ruediger Pluem]
 
   *) mod_rewrite: Allow Cookie option to set secure and HttpOnly flags.
      PR 44799 [Christian Wenz <christian wenz.org>]