Upstream tarball 2.2.17upstream/2.2.17

5 files changed, 28 insertions, 12 deletions

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index 1149076a..9b04d19c 100644
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -1,6 +1,6 @@
 # Include for creating start/stop/restart NCF scripts.

 

-instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf $(INSTALL)/$(BASEDIR)/ap2prod.ncf

+instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf $(INSTALL)/$(BASEDIR)/ap2prod.ncf

 

 $(INSTALL)/$(BASEDIR)/ap2start.ncf:

 	@echo # NCF to start Apache 2.x in own address space > $@

@@ -12,6 +12,17 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf:
 	@echo # load $(BASEDIR)/apache2 >> $@

 	@echo. >> $@

 

+$(INSTALL)/$(BASEDIR)/ap2auto.ncf:

+	@echo # NCF to start Apache 2.x in own address space > $@

+	@echo # and let automatically restart in case it crashes >> $@

+	@echo # Make sure that httpstk isn't listening on 80 >> $@

+	@echo # httpcloseport 80 /silent >> $@

+	@echo # search add SYS:/$(BASEDIR) >> $@

+	@echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@

+	@echo # If you have problems with 3rd-party modules try to load in OS space. >> $@

+	@echo # load $(BASEDIR)/apache2 >> $@

+	@echo. >> $@

+

 $(INSTALL)/$(BASEDIR)/ap2rest.ncf:

 	@echo # NCF to restart Apache 2.x in own address space > $@

 	@echo apache2 restart -p $(BASEDIR) >> $@

diff --git a/build/find_apu.m4 b/build/find_apu.m4
index dfa4e0e2..7937e005 100644
--- a/build/find_apu.m4
+++ b/build/find_apu.m4
@@ -185,7 +185,7 @@ AC_DEFUN([APR_FIND_APU], [
     fi
     dnl if we have not found anything yet and have bundled source, use that
     if test "$apu_found" = "no" && test -d "$1"; then
-      apu_temp_abs_srcdir="`cd $1 && pwd`"
+      apu_temp_abs_srcdir="`cd \"$1\" && pwd`"
       apu_found="reconfig"
       apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
       case $apu_bundled_major in
diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index d23d7f7f..e9388bdd 100644
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -147,6 +147,7 @@ BEGIN {
 	  print "#LoadModule proxy_connect_module modules/mod_proxy_connect.so" > dstfl;
 	  print "#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so" > dstfl;
 	  print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl;
+	  print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl;
 	  print "#LoadModule reqtimeout_module modules/mod_reqtimeout.so" > dstfl;
 	  print "#LoadModule rewrite_module modules/mod_rewrite.so" > dstfl;
 	  print "LoadModule setenvif_module modules/mod_setenvif.so" > dstfl;
diff --git a/build/ltmain.sh b/build/ltmain.sh
index 27d498a0..2bcb8482 100644
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -44,7 +44,7 @@ EXIT_FAILURE=1
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.5.26
-TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/build/rpm/htcacheclean.init b/build/rpm/htcacheclean.init
index 1f33f715..5309b2af 100644
--- a/build/rpm/htcacheclean.init
+++ b/build/rpm/htcacheclean.init
@@ -37,14 +37,18 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-if [ -f /etc/sysconfig/htcacheclean ]; then
-        . /etc/sysconfig/htcacheclean
+# What were we called? Multiple instances of the same daemon can be
+# created by creating suitably named symlinks to this startup script
+prog=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
+
+if [ -f /etc/sysconfig/${prog} ]; then
+        . /etc/sysconfig/${prog}
 fi
 
-# Path to the apachectl script, server binary, and short-form for messages.
+# Path to htcacheclean, server binary, and short-form for messages.
 htcacheclean=${HTTPD-/usr/sbin/htcacheclean}
-prog=htcacheclean
-lockfile=${LOCKFILE-/var/lock/subsys/htcacheclean}
+lockfile=${LOCKFILE-/var/lock/subsys/${prog}}
+pidfile=/var/log/httpd/${prog}.pid
 interval=${INTERVAL-10}
 cachepath=${CACHEPATH-/var/cache/httpd/cache-root}
 limit=${LIMIT-100M}
@@ -52,7 +56,7 @@ RETVAL=0
 
 start() {
         echo -n $"Starting $prog: "
-        daemon $htcacheclean -d "$interval" -p "$cachepath" -l "$limit" $OPTIONS
+        daemon --pidfile=${pidfile} $htcacheclean -d "$interval" -p "$cachepath" -l "$limit" -P "$pidfile" $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch ${lockfile}
@@ -60,7 +64,7 @@ start() {
 }
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $htcacheclean
+	killproc -p ${pidfile} $htcacheclean
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && rm -f ${lockfile}
@@ -75,7 +79,7 @@ case "$1" in
 	stop
 	;;
   status)
-        status $htcacheclean
+        status -p ${pidfile} $htcacheclean
 	RETVAL=$?
 	;;
   restart)
@@ -83,7 +87,7 @@ case "$1" in
 	start
 	;;
   condrestart)
-	if status $htcacheclean >&/dev/null; then
+	if status -p ${pidfile} $htcacheclean >&/dev/null; then
 		stop
 		start
 	fi