From: Jeff Trawick <trawick@apache.org>
Date: Mon, 19 Aug 2013 11:38:11 +0000 (+0000)
Subject: merged to 2.4.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995ac4b61b1da4202a71bf3e2ed0a014ffe5249f;p=thirdparty%2Fapache%2Fhttpd.git

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 346aa069632..43a9fd02620 100644
--- 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]