httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Allan Edwards <a...@us.ibm.com>
Subject Re: cvs commit: httpd-2.0 STATUS
Date Thu, 17 Apr 2003 19:36:47 GMT
> In order to record the 'evolution', and what happened here in CVS history,
> could we please apply the following patch -before- we commit Allen's patch 
> to fix the whole problem for good?  I'm just looking to document what
> was broken here and what the pre-2.0.46 side-effects were...

Let me be sure I understand - first you'd like the following patch
applied to APACHE_2_0_BRANCH (to document the bug that ap_sock_disable_nagle()
was declared but not defined for WIN32)

> changelog:
>   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 was never compiled on Win32.
> 

> 
> --- include/mpm_common.h        3 Feb 2003 17:31:30 -0000       1.39.2.1
> +++ include/mpm_common.h        17 Apr 2003 18:31:06 -0000
> @@ -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)
> +#if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) &&
!defined(WIN32)
>  /**
>   * 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

Then you'd like the above patch reverted and applied along with mine so that
we both declare & define ap_sock_disable_nagle() and allow Win32 to build
correctly with nagle disabled?

If so - no problem (I assume I don't need to ask for another vote...)

Allan




Mime
View raw message