httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/include mpm_common.h
Date Wed, 26 Jul 2000 14:12:39 GMT
trawick     00/07/26 07:12:38

  Modified:    src/main mpm_common.c
               src/include mpm_common.h
  Log:
  Get ap_socket_disable_nagle() working again.
  Submitted by:	Greg Ames
  Reviewed by:	Jeff Trawick
  
  Revision  Changes    Path
  1.25      +4 -1      apache-2.0/src/main/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mpm_common.c	2000/07/25 01:06:26	1.24
  +++ mpm_common.c	2000/07/26 14:12:38	1.25
  @@ -77,6 +77,9 @@
   #if HAVE_SYS_TIME_H
   #include <sys/time.h> /* for timeval definitions */
   #endif
  +#if HAVE_SYS_SOCKET_H
  +#include <sys/socket.h> /* for setsockopt prototype */
  +#endif
   
   #if defined(DEXTER) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
   #define CHILD_TABLE 1
  @@ -290,7 +293,7 @@
        */
       int just_say_no = 1;
   
  -    if (ap_setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &just_say_no,
  +    if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &just_say_no,
                      sizeof(int)) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_WARNING, errno, ap_server_conf,
                       "setsockopt: (TCP_NODELAY)");
  
  
  
  1.6       +4 -0      apache-2.0/src/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_common.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mpm_common.h	2000/07/10 22:08:07	1.5
  +++ mpm_common.h	2000/07/26 14:12:38	1.6
  @@ -74,6 +74,10 @@
   extern "C" {
   #endif
   
  +#ifdef HAVE_NETINET_TCP_H
  +#include <netinet/tcp.h>    /* for TCP_NODELAY */
  +#endif
  +        
   void ap_reclaim_child_processes(int terminate);
   void ap_wait_or_timeout(ap_wait_t *status, ap_proc_t *ret, ap_pool_t *p);
   void ap_process_child_status(ap_proc_t *pid, ap_wait_t status);
  
  
  

Mime
View raw message