Sync with 2.2.4

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

diff --git a/CHANGES b/CHANGES
index 138a7387c3856eca59febddd5096052a3101c6be..3c0a93eb42cfac9c66480e939281f7877190c6ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) core: Fix NONBLOCK status of listening sockets on restart/graceful
-     [Darius Davis <darius-abz free-range.com.au>]
-
   *) mod_proxy_http: Handle request bodies larger than 2 GB by converting
      the Content-Length header of the request correctly. PR 40883.
      [Ruediger Pluem, toadie <toadie643 gmail.com>]
@@ -233,6 +230,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) core: Fix NONBLOCK status of listening sockets on restart/graceful
+     PR 37680.  [Darius Davis <darius-abz free-range.com.au>]
+
   *) mod_deflate: Rework inflate output and deflate output filter to fix several
      issues: Incorrect handling of flush buckets, potential memory leaks,
      excessive memory usage in inflate output filter for large compressed