merged to 2.4.x

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

diff --git a/CHANGES b/CHANGES
index 346aa069632216860212d3e8a9a28458e7e7d0e6..43a9fd02620f0343ac4d7f8906c4e2de6cd6e347 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) fcgistarter: Specify SO_REUSEADDR to allow starting a server
-     with old connections in TIME_WAIT.  [Jeff Trawick]
-
   *) mod_auth_basic: Add AuthBasicUseDigestAlgorithm directive to
      allow migration of passwords from digest to basic authentication.
      [Chris Darroch]