From: Jim Jagielski <jim@apache.org>
Date: Wed, 17 Sep 2008 19:53:07 +0000 (+0000)
Subject: fix double note
X-Git-Tag: 2.2.10~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6fe999e390bc7968efb117c94356e2050f46a3;p=thirdparty%2Fapache%2Fhttpd.git

fix double note


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

diff --git a/CHANGES b/CHANGES
index adee0cd4c89..45933452fda 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,9 +25,9 @@ Changes with Apache 2.2.10
   *) mod_ssl: Rewrite shmcb to avoid memory alignment issues.  PR 42101.
      [Geoff Thorpe]
 
-  *) 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_dav_fs: Retrieve minimal system information about directory
      entries when walking a DAV fs, resolving a performance degradation on