Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 9096 invoked by uid 500); 17 Apr 2003 20:26:34 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 9069 invoked by uid 500); 17 Apr 2003 20:26:34 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 17 Apr 2003 20:26:33 -0000 Message-ID: <20030417202633.41321.qmail@icarus.apache.org> From: ake@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server mpm_common.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N ake 2003/04/17 13:26:33 Modified: . Tag: APACHE_2_0_BRANCH CHANGES include Tag: APACHE_2_0_BRANCH mpm_common.h server Tag: APACHE_2_0_BRANCH 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 No revision No revision 1.988.2.82 +4 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.988.2.81 retrieving revision 1.988.2.82 diff -u -r1.988.2.81 -r1.988.2.82 --- CHANGES 17 Apr 2003 20:17:29 -0000 1.988.2.81 +++ CHANGES 17 Apr 2003 20:26:32 -0000 1.988.2.82 @@ -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 No revision No revision 1.39.2.3 +1 -1 httpd-2.0/include/mpm_common.h Index: mpm_common.h =================================================================== RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v retrieving revision 1.39.2.2 retrieving revision 1.39.2.3 diff -u -r1.39.2.2 -r1.39.2.3 --- mpm_common.h 17 Apr 2003 20:17:31 -0000 1.39.2.2 +++ mpm_common.h 17 Apr 2003 20:26:33 -0000 1.39.2.3 @@ -139,7 +139,7 @@ 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 No revision No revision 1.102.2.3 +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.102.2.2 retrieving revision 1.102.2.3 diff -u -r1.102.2.2 -r1.102.2.3 --- mpm_common.c 20 Mar 2003 21:56:06 -0000 1.102.2.2 +++ mpm_common.c 17 Apr 2003 20:26:33 -0000 1.102.2.3 @@ -302,7 +302,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