httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/threaded threaded.c
Date Mon, 05 Mar 2001 20:15:16 GMT
trawick     01/03/05 12:15:15

  Modified:    include  mpm_common.h
               .        configure.in
               server/mpm/perchild perchild.c
               server/mpm/threaded threaded.c
  Log:
  Rely on APR to determine whether or not we have netinet/tcp.h.  This test
  requires a special work-around for IRIX 6.5, which will be in APR soon.
  There is no need for it in Apache.
  
  The include of netinet/tcp.h was removed from perchild.c and threaded.c.
  They no longer seem to be needed there.
  
  PR:		6459
  
  Revision  Changes    Path
  1.17      +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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mpm_common.h	2001/03/01 00:55:02	1.16
  +++ mpm_common.h	2001/03/05 20:15:10	1.17
  @@ -72,7 +72,7 @@
   
   #include "ap_config.h"
   
  -#ifdef HAVE_NETINET_TCP_H
  +#if APR_HAVE_NETINET_TCP_H
   #include <netinet/tcp.h>    /* for TCP_NODELAY */
   #endif
   
  
  
  
  1.127     +0 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- configure.in	2001/02/24 14:17:24	1.126
  +++ configure.in	2001/03/05 20:15:12	1.127
  @@ -89,7 +89,6 @@
   limits.h \
   unistd.h \
   sys/socket.h \
  -netinet/tcp.h \
   pwd.h \
   grp.h \
   strings.h
  
  
  
  1.55      +0 -4      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- perchild.c	2001/03/02 22:46:32	1.54
  +++ perchild.c	2001/03/05 20:15:14	1.55
  @@ -92,10 +92,6 @@
   #include "scoreboard.h"
   #include "util_filter.h"
   
  -#ifdef HAVE_NETINET_TCP_H
  -#include <netinet/tcp.h>
  -#endif
  -
   /* ### should be APR-ized */
   #include <poll.h>
   #include <grp.h>
  
  
  
  1.12      +0 -4      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- threaded.c	2001/03/02 22:46:33	1.11
  +++ threaded.c	2001/03/05 20:15:15	1.12
  @@ -88,10 +88,6 @@
   #include "ap_listen.h"
   #include "scoreboard.h" 
   
  -#ifdef HAVE_NETINET_TCP_H
  -#include <netinet/tcp.h>
  -#endif
  -
   #include <signal.h>
   
   /*
  
  
  

Mime
View raw message