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 listen.c
Date Wed, 04 Feb 2004 14:12:06 GMT
trawick     2004/02/04 06:12:06

  Modified:    .        CHANGES
               server   listen.c
  Log:
  FreeBSD: Use the httpready accept filter instead of dataready on
  newer levels of the OS.
  
  Submitted by: Paul Querna <chip force-elite.com>
  Reviewed by:  Jeff Trawick
  
  Revision  Changes    Path
  1.1393    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1392
  retrieving revision 1.1393
  diff -u -r1.1392 -r1.1393
  --- CHANGES	3 Feb 2004 21:55:32 -0000	1.1392
  +++ CHANGES	4 Feb 2004 14:12:06 -0000	1.1393
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) FreeBSD: Use the httpready accept filter instead of dataready on
  +     newer levels of the OS.  [Paul Querna <chip force-elite.com>]
  +
     *) Delete some make-generated files in the server directory during 
        "make clean" processing.  PR 26552.  [Jeff Trawick]
   
  
  
  
  1.96      +6 -0      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- listen.c	1 Jan 2004 13:26:23 -0000	1.95
  +++ listen.c	4 Feb 2004 14:12:06 -0000	1.96
  @@ -199,7 +199,13 @@
   
   #if APR_HAS_SO_ACCEPTFILTER
   #ifndef ACCEPT_FILTER_NAME
  +#define ACCEPT_FILTER_NAME "httpready"
  +#ifdef __FreeBSD_version
  +#if __FreeBSD_version < 411000 /* httpready broken before 4.1.1 */
  +#undef ACCEPT_FILTER_NAME
   #define ACCEPT_FILTER_NAME "dataready"
  +#endif
  +#endif
   #endif
       apr_socket_accept_filter(s, ACCEPT_FILTER_NAME, "");
   #endif
  
  
  

Mime
View raw message