httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@locus.apache.org
Subject cvs commit: apache-1.3/src/include ap_config.h
Date Sun, 05 Nov 2000 02:56:18 GMT
dgaudet     00/11/04 18:56:18

  Modified:    src      CHANGES Configure
               src/helpers GuessOS
               src/include ap_config.h
  Log:
  linux kernel hackers indicated that it was time
  for apache to drop the serialisation on linux; and a
  switch to sysv semaphores is preferred for performance.
  see <Pine.LNX.4.21.0011041233550.1897-100000@twinlark.arctic.org> in
  new-httpd archive for more details.
  
  Submitted by:	Andrew Morton <andrewm@uow.edu.au>
  
  Revision  Changes    Path
  1.1595    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1594
  retrieving revision 1.1595
  diff -u -r1.1594 -r1.1595
  --- CHANGES	2000/11/04 04:16:08	1.1594
  +++ CHANGES	2000/11/05 02:56:16	1.1595
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.15
   
  +  *) Linux 2.2.x and later do not need a serialised single listener,
  +     and sysv semaphores scale better than fcntl.  Updated GuessOS
  +     to distinguish 2.0.x from 2.2.x -- 2.0.x will still use fcntl.
  +     [Andrew Morton <andrewm@uow.edu.au>, Dean Gaudet]
  +
     *) Eliminate caching problems of mod_autoindex results, so the last
        modified date of the directory is returned as the Last-Modified 
        and ETag HTTP header tags are sent if IndexOptions TrackModified
  
  
  
  1.408     +8 -2      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.407
  retrieving revision 1.408
  diff -u -r1.407 -r1.408
  --- Configure	2000/11/03 18:37:49	1.407
  +++ Configure	2000/11/05 02:56:16	1.408
  @@ -429,10 +429,16 @@
   	    CFLAGS="$CFLAGS -DIRIX"
   	fi
   	;;
  -    *-linux2)
  +    *-linux20)
   	DEF_WANTHSREGEX=yes
   	OS='Linux'
  -	CFLAGS="$CFLAGS -DLINUX=2"
  +	CFLAGS="$CFLAGS -DLINUX=20"
  +	LIBS="$LIBS -lm"
  +	;;
  +    *-linux22)
  +	DEF_WANTHSREGEX=yes
  +	OS='Linux'
  +	CFLAGS="$CFLAGS -DLINUX=22"
   	LIBS="$LIBS -lm"
   	;;
       *-GNU*)
  
  
  
  1.69      +5 -1      apache-1.3/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- GuessOS	2000/04/18 19:26:33	1.68
  +++ GuessOS	2000/11/05 02:56:17	1.69
  @@ -114,8 +114,12 @@
   	echo "${MACHINE}-sgi-irix64"; exit 0
   	;;
   
  +    Linux:2.0.*)
  +    	echo "${MACHINE}-whatever-linux20"; exit 0
  +	;;
  +
       Linux:[2-9].*)
  -	echo "${MACHINE}-whatever-linux2"; exit 0
  +	echo "${MACHINE}-whatever-linux22"; exit 0
   	;;
   
       Linux:1.*)
  
  
  
  1.296     +8 -5      apache-1.3/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
  retrieving revision 1.295
  retrieving revision 1.296
  diff -u -r1.295 -r1.296
  --- ap_config.h	2000/11/03 18:37:54	1.295
  +++ ap_config.h	2000/11/05 02:56:17	1.296
  @@ -522,12 +522,15 @@
   #define HAVE_MMAP 1
   #define USE_MMAP_FILES
   
  -/* flock is faster ... but hasn't been tested on 1.x systems */
  -/* PR#3531 indicates flock() may not be stable, probably depends on
  - * kernel version.  Go back to using fcntl, but provide a way for
  - * folks to tweak their Configuration to get flock.
  +#if LINUX > 20
  +/* see Pine.LNX.4.21.0011041233550.1897-100000@twinlark.arctic.org
  + * in new-httpd archives for performance numbers indicating these
  + * are the right choices for linux 2.2.x and later
    */
  -#ifndef USE_FLOCK_SERIALIZED_ACCEPT
  +#define USE_SYSVSEM_SERIALIZED_ACCEPT
  +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT 
  +#define NEED_UNION_SEMUN
  +#else
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #endif
   
  
  
  

Mime
View raw message