From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 19 Sep 2005 14:57:07 +0000 (+0000)
Subject: Backport r239710, r239711, r239732, r239740 and r241815 to the 2.2.x branch;
X-Git-Tag: 2.3.0~2990
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b947badaa9f8a34c4f0edde401141e2216b39d;p=thirdparty%2Fapache%2Fhttpd.git

Backport r239710, r239711, r239732, r239740 and r241815 to the 2.2.x branch;
Fix PR 28167, which means we stop listening on ports when we do a
graceful-restart.



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

diff --git a/CHANGES b/CHANGES
index 16c755cf5e1..9b0ee407fb9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,10 +28,6 @@ Changes with Apache 2.3.0
      "GracefulShutdownTimeout" number of seconds before exiting. 
      [Colm MacCarthaigh, Ken Coar, Bill Stoddard]
 
-  *) prefork, worker and event MPMs: Prevent children from holding open 
-     listening ports upon graceful restart or stop. PR 28167. 
-     [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
-
   *) Teach mod_ssl to use arbitrary OIDs in an SSLRequire directive,
      allowing string-valued client certificate attributes to be used for
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
@@ -39,6 +35,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) prefork, worker and event MPMs: Prevent children from holding open 
+     listening ports upon graceful restart or stop. PR 28167. 
+     [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
+
   *) mod_proxy/mod_proxy_balancer: lbmethods now implemented as
      providers. Prevent problems when no Vhost containers were
      configured with proxy balancers. [Jim Jagielski]