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/branches/APACHE_2_0_BRANCH@99420 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2d8224cd814521f499c617d7d5ca4dcd4dd704e7..f5578fbb75437dd964bdf51d2f21843ac8052a11 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 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]
+
   *) Correct a mis-correlation between mpm_common.c and mpm_common.h;
      This patch reverts us to pre-2.0.46 behavior, using the 
      ap_sock_disable_nagle noop macro, because ap_sock_disable_nagle 

diff --git a/include/mpm_common.h b/include/mpm_common.h
index e5a74366e54ec3f4deea24def0c9e738a70082a0..1c598b480755099f840729ca64f0e5d820212390 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -139,7 +139,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret,
 int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status);
 #endif
 
-#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) && !defined(WIN32)
+#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
 /**
  * Turn off the nagle algorithm for the specified socket.  The nagle algorithm
  * says that we should delay sending partial packets in the hopes of getting

diff --git a/server/mpm_common.c b/server/mpm_common.c
index f2c08e6d9c652456af5c1295f1dd258544fcf280..120a705960711da4c643bb5bf12ce5cfa781bc87 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -302,7 +302,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