From: Allan K. Edwards <ake@apache.org>
Date: Tue, 15 Apr 2003 22:34:47 +0000 (+0000)
Subject: Enable ap_sock_disable_nagle for Windows. This along with the addition of
X-Git-Tag: pre_ajp_proxy~1847
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a070f737a48eab5a87894224e8381588aa8ace4f;p=thirdparty%2Fapache%2Fhttpd.git

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.


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

diff --git a/CHANGES b/CHANGES
index 753b49c37d3..16e580a7640 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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]
 
diff --git a/server/mpm_common.c b/server/mpm_common.c
index e55a8ee2b6f..0fc9d8d3ba6 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -305,7 +305,7 @@ int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status)
 }
 #endif /* AP_MPM_WANT_PROCESS_CHILD_STATUS */
 
-#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) && !defined(WIN32)
+#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
 void ap_sock_disable_nagle(apr_socket_t *s)
 {
     /* The Nagle algorithm says that we should delay sending partial