From: Jeff Trawick <trawick@apache.org>
Date: Mon, 19 Aug 2013 11:38:11 +0000 (+0000)
Subject: merged to 2.4.x
X-Git-Tag: 2.5.0-alpha~5177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=968a898e1424c6dcbc764e3c2077a94db760e0e6;p=apache

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 346aa06963..43a9fd0262 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]