From: Eric Covener <covener@apache.org>
Date: Wed, 17 Sep 2008 16:43:14 +0000 (+0000)
Subject: this is the CHANGES entry that goes with the reviewed/approved code.
X-Git-Tag: 2.2.10~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30055e973c97b17b82f7b351f3e041964fd0e676;p=thirdparty%2Fapache%2Fhttpd.git

this is the CHANGES entry that goes with the reviewed/approved code.
proxy-initial-not-pooled is already backported and in CHANGES


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

diff --git a/CHANGES b/CHANGES
index 2eb5195496e..adee0cd4c89 100644
--- 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_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_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_rewrite: Allow Cookie option to set secure and HttpOnly flags.
      PR 44799 [Christian Wenz <christian wenz.org>]