You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ak...@apache.org on 2003/04/16 00:34:48 UTC
cvs commit: httpd-2.0/server mpm_common.c
ake 2003/04/15 15:34:47
Modified: . CHANGES
server mpm_common.c
Log:
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.
Revision Changes Path
1.1145 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1144
retrieving revision 1.1145
diff -u -r1.1144 -r1.1145
--- CHANGES 15 Apr 2003 17:39:43 -0000 1.1144
+++ CHANGES 15 Apr 2003 22:34:46 -0000 1.1145
@@ -2,6 +2,11 @@
[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]
1.107 +1 -1 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mpm_common.c 9 Apr 2003 16:58:29 -0000 1.106
+++ mpm_common.c 15 Apr 2003 22:34:47 -0000 1.107
@@ -305,7 +305,7 @@
}
#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