update to reflect a merged fix

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

diff --git a/CHANGES b/CHANGES
index 66f8234d2545a175a1b2e8436abf0da4d012a35d..bbec52a400b258d8ad04bcff01675df608d691cd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) mod_cgid: Eliminate a double-close of a socket.  This resolves
-     various operational problems in a threaded MPM, since on the
-     second attempt to close the socket, the same descriptor was
-     often already in use by another thread for another purpose.
-     [Jeff Trawick]
-
   *) Unix: Handle permissions settings for flock-based mutexes in 
      unixd_set_global|proc_mutex_perms().  Allow the functions to be
      called for any type of mutex.  PR 20312  [Jeff Trawick]
@@ -159,6 +153,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.47
 
+  *) mod_cgid: Eliminate a double-close of a socket.  This resolves
+     various operational problems in a threaded MPM, since on the
+     second attempt to close the socket, the same descriptor was
+     often already in use by another thread for another purpose.
+     [Jeff Trawick]
+
   *) mod_negotiation: Introduce "prefer-language" environment variable,
      which allows to influence the negotiation process on request basis
      to prefer a certain language.  [André Malo]