Backport graceful-stop to the 2.2.x branch.

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

diff --git a/CHANGES b/CHANGES
index 9b0ee407fb91139e7c5f09cb5d3e3f71e2ca8d51..e284fd6d34689d3d26ee2e7b5b2f8deb4591a599 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,11 +23,6 @@ Changes with Apache 2.3.0
 
   *) Doxygen fixup [Neale Ranns <neale ranns.org>, Ian Holsman]
 
-  *) prefork, worker and event MPMs: Support a graceful-stop procedure:
-     Server will wait until existing requests are finished or until  
-     "GracefulShutdownTimeout" number of seconds before exiting. 
-     [Colm MacCarthaigh, Ken Coar, Bill Stoddard]
-
   *) 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")
@@ -35,6 +30,11 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) prefork, worker and event MPMs: Support a graceful-stop procedure:
+     Server will wait until existing requests are finished or until  
+     "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>]