httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: httpd-2.0/include mpm_common.h
Date Thu, 17 Apr 2003 20:17:31 GMT
ake         2003/04/17 13:17:31

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               include  Tag: APACHE_2_0_BRANCH mpm_common.h
  Log:
  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.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.81 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.80
  retrieving revision 1.988.2.81
  diff -u -r1.988.2.80 -r1.988.2.81
  --- CHANGES	17 Apr 2003 02:57:22 -0000	1.988.2.80
  +++ CHANGES	17 Apr 2003 20:17:29 -0000	1.988.2.81
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.46
   
  +  *) 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. [Allan Edwards, William Rowe]
  +
     *) Fix a build problem with passing unsupported --enable-layout
        args to apr and apr-util.  This broke binbuild.sh as well as
        user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.39.2.2  +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.1
  retrieving revision 1.39.2.2
  diff -u -r1.39.2.1 -r1.39.2.2
  --- mpm_common.h	3 Feb 2003 17:31:30 -0000	1.39.2.1
  +++ mpm_common.h	17 Apr 2003 20:17:31 -0000	1.39.2.2
  @@ -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
  
  
  

Mime
View raw message