httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Mon, 14 Jan 2002 04:49:44 GMT
fanf        02/01/13 20:49:44

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Following taunts from Alfred Perlstein on IRC, use "httpready"
  accept filter rather than "dataready" on FreeBSD after 4.1.1-RELEASE
  where it works correctly.
  
  Revision  Changes    Path
  1.1752    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1751
  retrieving revision 1.1752
  diff -u -r1.1751 -r1.1752
  --- CHANGES	11 Jan 2002 20:36:08 -0000	1.1751
  +++ CHANGES	14 Jan 2002 04:49:44 -0000	1.1752
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.23
   
  +  *) Use "httpready" accept filter rather than "dataready" on
  +     FreeBSD after 4.1.1-RELEASE where it works correctly.
  +     [Tony Finch]
  +
     *) Fix incorrect "Content-Length" header in the 416 "range not
        satisfiable" response. [Joe Orton <joe@manyfish.co.uk>]
   
  
  
  
  1.567     +6 -0      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.566
  retrieving revision 1.567
  diff -u -r1.566 -r1.567
  --- http_main.c	8 Jan 2002 19:54:08 -0000	1.566
  +++ http_main.c	14 Jan 2002 04:49:44 -0000	1.567
  @@ -3728,8 +3728,14 @@
   #ifdef SO_ACCEPTFILTER
       if (ap_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 /* ! ACCEPT_FILTER_NAME */
   	/*
   	 * See htdocs/manual/misc/perf-bsd44.html for a discussion of
   	 * how to enable this feature and various issues with it.
  
  
  

Mime
View raw message