diff options
Diffstat (limited to 'www/apache13-fp/files/patch-ak')
| -rw-r--r-- | www/apache13-fp/files/patch-ak | 127 |
1 files changed, 87 insertions, 40 deletions
diff --git a/www/apache13-fp/files/patch-ak b/www/apache13-fp/files/patch-ak index 905ae48ce8d1..a976cce63aa7 100644 --- a/www/apache13-fp/files/patch-ak +++ b/www/apache13-fp/files/patch-ak @@ -1,5 +1,5 @@ --- src/support/apachectl.orig Tue Apr 6 15:36:33 1999 -+++ src/support/apachectl Mon Sep 6 13:01:08 1999 ++++ src/support/apachectl Thu Feb 24 22:20:05 2000 @@ -27,6 +27,10 @@ # the path to your httpd binary, including options if necessary HTTPD='/usr/local/apache/src/httpd' @@ -20,38 +20,32 @@ ERROR=0 ARGV="$@" if [ "x$ARGV" = "x" ] ; then -@@ -75,6 +81,30 @@ - ERROR=3 +@@ -47,6 +53,9 @@ + + for ARG in $@ $ARGS + do ++ ++ MODULES=`echo $ARG | awk 'BEGIN { RS="_"}!($1 == "start" || $1 == "stop" || $1 == "restart" || $1 == "fullstatus" || $1 == "status" || $1 == "graceful" || $1 == "configtest"){ s = sprintf("%s -DMOD_%s", s, $1)}END{ printf s}'` ++ + # check for pidfile + if [ -f $PIDFILE ] ; then + PID=`cat $PIDFILE` +@@ -63,12 +72,12 @@ + fi + + case $ARG in +- start) ++ start*) + if [ $RUNNING -eq 1 ]; then + echo "$0 $ARG: httpd (pid $PID) already running" + continue fi - ;; -+ startfp|fpstart|start-FP) -+ if [ $RUNNING -eq 1 ]; then -+ echo "$0 $ARG: httpd (pid $PID) already running" -+ continue -+ fi -+ if $HTTPD -DFRONTPAGE; then -+ echo "$0 $ARG: httpd started" -+ else -+ echo "$0 $ARG: httpd could not be started" -+ ERROR=3 -+ fi -+ ;; -+ startfpssl|start-FP-SSL) -+ if [ $RUNNING -eq 1 ]; then -+ echo "$0 $ARG: httpd (pid $PID) already running" -+ continue -+ fi -+ if $HTTPD -DFRONTPAGE -DSSL; then -+ echo "$0 $ARG: httpd started" -+ else -+ echo "$0 $ARG: httpd could not be started" -+ ERROR=3 -+ fi -+ ;; - stop) - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $STATUS" -@@ -82,6 +112,7 @@ +- if $HTTPD ; then ++ if $HTTPD $MODULES; then + echo "$0 $ARG: httpd started" + else + echo "$0 $ARG: httpd could not be started" +@@ -82,22 +91,23 @@ fi if kill $PID ; then echo "$0 $ARG: httpd stopped" @@ -59,12 +53,65 @@ else echo "$0 $ARG: httpd could not be stopped" ERROR=4 -@@ -153,6 +184,8 @@ - cat <<EOF + fi + ;; +- restart) ++ restart*) + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: httpd not running, trying to start" +- if $HTTPD ; then ++ if $HTTPD $MODULES; then + echo "$0 $ARG: httpd started" + else + echo "$0 $ARG: httpd could not be started" + ERROR=5 + fi + else +- if $HTTPD -t >/dev/null 2>&1; then ++ if $HTTPD -t ${MODULES} >/dev/null 2>&1; then + if kill -HUP $PID ; then + echo "$0 $ARG: httpd restarted" + else +@@ -111,17 +121,17 @@ + fi + fi + ;; +- graceful) ++ graceful*) + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: httpd not running, trying to start" +- if $HTTPD ; then ++ if $HTTPD $MODULES; then + echo "$0 $ARG: httpd started" + else + echo "$0 $ARG: httpd could not be started" + ERROR=5 + fi + else +- if $HTTPD -t >/dev/null 2>&1; then ++ if $HTTPD -t ${MODULES} >/dev/null 2>&1; then + if kill -USR1 $PID ; then + echo "$0 $ARG: httpd gracefully restarted" + else +@@ -141,8 +151,8 @@ + fullstatus) + $LYNX $STATUSURL + ;; +- configtest) +- if $HTTPD -t; then ++ configtest*) ++ if $HTTPD -t ${MODULES}; then + : + else + ERROR=8 +@@ -161,6 +171,10 @@ + graceful - do a graceful restart by sending a SIGUSR1 or start if not running + configtest - do a configuration syntax test + help - this screen ++ ++ ++ NOTE: You may also use (start|restart|graceful|configtest)_MODULE1[_MODULE2[..]] ++ to start the server with -DMOD_MODULE1[ -DMOD_MODULE2[..]]. - start - start httpd -+startfp - start httpd with Frontpage enabled -+startfpssl - start httpd with Frontpage and SSL enabled - stop - stop httpd - restart - restart httpd if running by sending a SIGHUP or start if - not running + EOF + ERROR=2 |