From: Allan K. Edwards <ake@apache.org>
Date: Thu, 17 Apr 2003 21:32:27 +0000 (+0000)
Subject: reflect the fact that Windows disable nagle has been backported to 2.0.46-dev
X-Git-Tag: pre_ajp_proxy~1830
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25129ff35086ba34aed45252447b5dddcd052f14;p=thirdparty%2Fapache%2Fhttpd.git

reflect the fact that Windows disable nagle has been backported to 2.0.46-dev


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

diff --git a/CHANGES b/CHANGES
index 9e796386ad7..03a8eaed47a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,11 +6,6 @@ Changes with Apache 2.1.0-dev
      on some platforms when mod_so was enabled by default, breaking 
      DSOs on AIX.  PR 19012  [Jeff Trawick]
 
-  *) Enable ap_sock_disable_nagle for Windows. This along with the  
-     addition of  APR_TCP_NODELAY_INHERITED to apr.hw will cause Nagle 
-     to be disabled for Windows.
-     [Allan Edwards]
-
   *) ssl_toolkit_compat.h and code fixes to build clean on SSLC.
      [William Rowe, Madhusudan Mathihalli]
 
@@ -163,6 +158,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Enable ap_sock_disable_nagle for Windows. This along with the  
+     addition of  APR_TCP_NODELAY_INHERITED to apr.hw will cause Nagle 
+     to be disabled for Windows. [Allan Edwards]
+
   *) Fix a build problem with passing unsupported --enable-layout
      args to apr and apr-util.  This broke binbuild.sh as well as
      user-specified layout parameters.  PR 18649 [Justin Erenkrantz,