httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src Configure CHANGES
Date Tue, 12 Jun 2001 08:39:06 GMT
martin      01/06/12 01:39:06

  Modified:    src/main http_main.c
               src/include ap_config.h
               src/helpers install.sh binbuild.sh
               src      Configure CHANGES
  Log:
  Fixes to produce the Cygwin 1.x binaries out-of-the-box;
  Fix perform_idle_server_maintenance() for Cygwin: use SIGKILL rather
  than SIGUSR1 because the latter has no effect.
  
  PR: PR#7837 and PR#7838
  Submitted by:	Stipe Tolj <tolj@wapme-systems.de>
  Reviewed by:	Martin Kraemer
  
  Revision  Changes    Path
  1.541     +17 -2     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.540
  retrieving revision 1.541
  diff -u -u -r1.540 -r1.541
  --- http_main.c	2001/06/11 20:35:28	1.540
  +++ http_main.c	2001/06/12 08:38:56	1.541
  @@ -4429,6 +4429,20 @@
   #endif
   static int hold_off_on_exponential_spawning;
   
  +/*
  + * Define the signal that is used to kill off children if idle_count
  + * is greater then ap_daemons_max_free. Usually we will use SIGUSR1
  + * to gracefully shutdown, but unfortunatly some OS will need other 
  + * signals to ensure that the child process is terminated and the 
  + * scoreboard pool is not growing to infinity. This effect has been
  + * seen at least on Cygwin 1.x. -- Stipe Tolj <tolj@wapme-systems.de>
  + */
  +#if defined(CYGWIN)
  +#define SIG_IDLE_KILL SIGKILL
  +#else
  +#define SIG_IDLE_KILL SIGUSR1
  +#endif
  +
   static void perform_idle_server_maintenance(void)
   {
       int i;
  @@ -4508,9 +4522,10 @@
       if (idle_count > ap_daemons_max_free) {
   	/* kill off one child... we use SIGUSR1 because that'll cause it to
   	 * shut down gracefully, in case it happened to pick up a request
  -	 * while we were counting
  +	 * while we were counting. Use the define SIG_IDLE_KILL to reflect
  +	 * which signal should be used on the specific OS.
   	 */
  -	kill(ap_scoreboard_image->parent[to_kill].pid, SIGUSR1);
  +	kill(ap_scoreboard_image->parent[to_kill].pid, SIG_IDLE_KILL);
   	idle_spawn_rate = 1;
       }
       else if (idle_count < ap_daemons_min_free) {
  
  
  
  1.308     +6 -0      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.307
  retrieving revision 1.308
  diff -u -u -r1.307 -r1.308
  --- ap_config.h	2001/04/06 03:13:11	1.307
  +++ ap_config.h	2001/06/12 08:38:59	1.308
  @@ -955,6 +955,12 @@
   #define JMP_BUF jmp_buf
   #define NO_KILLPG
   #define USE_LONGJMP
  +#define GDBM_STATIC
  +#define HAVE_MMAP 1
  +#define USE_MMAP_SCOREBOARD
  +#define USE_MMAP_FILES
  +#define HAVE_SYSLOG 1
  +
   
   #else
   /* Unknown system - Edit these to match */
  
  
  
  1.9       +5 -1      apache-1.3/src/helpers/install.sh
  
  Index: install.sh
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/helpers/install.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- install.sh	1999/12/10 11:03:20	1.8
  +++ install.sh	2001/06/12 08:39:01	1.9
  @@ -87,7 +87,11 @@
       dst="$dst/`basename $src`"
   fi
   
  -#  Add a possible extension (such as ".exe") to src and dst
  +#  Check if we need to add an executable extension (such as ".exe") 
  +#  on specific OS to src and dst
  +if [ -f "$src.exe" ]; then
  +  ext=".exe"
  +fi
   src="$src$ext"
   dst="$dst$ext"
   
  
  
  
  1.18      +2 -0      apache-1.3/src/helpers/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -u -r1.17 -r1.18
  --- binbuild.sh	2000/10/23 15:48:00	1.17
  +++ binbuild.sh	2001/06/12 08:39:01	1.18
  @@ -9,6 +9,8 @@
   OS=`src/helpers/GuessOS`
   case "x$OS" in
     x*390*) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most";;
  +  *cygwin*) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most \
  +                         --enable-rule=SHARED_CORE --libexecdir=bin";;
         *) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most --enable-shared=max";;
   esac
   APDIR=`pwd`
  
  
  
  1.428     +2 -1      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.427
  retrieving revision 1.428
  diff -u -u -r1.427 -r1.428
  --- Configure	2001/05/18 15:45:39	1.427
  +++ Configure	2001/06/12 08:39:02	1.428
  @@ -840,7 +840,8 @@
   	OSDIR="os/cygwin"
   	CFLAGS="$CFLAGS -DCYGWIN"
   	DEF_WANTHSREGEX=yes
  -	LIBS="$LIBS -lcrypt"
  +	DBM_LIB="-lgdbm"
  +	LIBS="$LIBS -lcrypt $DBM_LIB"
   	;;
       *) # default: Catch systems we don't know about
   	OS='Unknown and unsupported OS'
  
  
  
  1.1689    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1688
  retrieving revision 1.1689
  diff -u -u -r1.1688 -r1.1689
  --- CHANGES	2001/06/11 22:17:19	1.1688
  +++ CHANGES	2001/06/12 08:39:03	1.1689
  @@ -1,4 +1,9 @@
   Changes with Apache 1.3.21
  +
  +  *) (Cygwin only) Fix problems with signals sent to child processes;
  +     Improve auto-configuration for Cygwin.
  +     [Stipe Tolj <tolj@wapme-systems.de>]
  +
     *) Added Mod_Vhost_Alias to the project file so that it builds as an
        external module (VHOST.NLM). 
        [Brad Nicholes <BNICHOLES@novell.com>]
  
  
  

Mime
View raw message