Commit b9f5c7a4 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

kill -l requires the short version of the signal (without SIG prefix). 

(apachectl graceful was broken.)

The best way to do this is to change configure to internally represent
the signal without the SIG prefix and prepend SIG before substitution
(and export a version without the SIG prefix for apachectl).

This highlights why we want to move apachectl's core functionality into
httpd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91102 13f79535-47bb-0310-9956-ffa450edef68
parent eeaa14d8

configure.in

+9 −4
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ esac 
APACHE_SUBST(SHLTCFLAGS)

APACHE_SUBST(LTCFLAGS)



AP_SIG_GRACEFUL=SIGUSR1

AP_SIG_GRACEFUL=USR1



case $host in

  *-apple-aux3*)
@@ -160,7 +160,7 @@ case $host in 
  *-linux-*)

      case `uname -r` in

        2.0* ) 

            AP_SIG_GRACEFUL=SIGWINCH

            AP_SIG_GRACEFUL=WINCH

            ;;

        2.[[2-9]]* ) 

            APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
@@ -353,9 +353,14 @@ if test "$SINGLE_LISTEN_UNSERIALIZED_ACCEPT" = "1"; then 
              [This platform doesn't suffer from the thundering herd problem])

fi



AC_DEFINE_UNQUOTED(AP_SIG_GRACEFUL, $AP_SIG_GRACEFUL, [Signal used to gracefully restart])

AC_DEFINE_UNQUOTED(AP_SIG_GRACEFUL_STRING, "$AP_SIG_GRACEFUL", [Signal used to gracefully restart (as a quoted string)])

AC_DEFINE_UNQUOTED(AP_SIG_GRACEFUL, SIG$AP_SIG_GRACEFUL, [Signal used to gracefully restart])

AC_DEFINE_UNQUOTED(AP_SIG_GRACEFUL_STRING, "SIG$AP_SIG_GRACEFUL", [Signal used to gracefully restart (as a quoted string)])

AC_DEFINE_UNQUOTED(AP_SIG_GRACEFUL_SHORT, $AP_SIG_GRACEFUL, [Signal used to gracefully restart (without SIG prefix)])

AP_SIG_GRACEFUL_SHORT=$AP_SIG_GRACEFUL

AP_SIG_GRACEFUL=SIG$AP_SIG_GRACEFUL_SHORT

AC_SUBST(AP_SIG_GRACEFUL)

AC_SUBST(AP_SIG_GRACEFUL_STRING)

AC_SUBST(AP_SIG_GRACEFUL_SHORT)



dnl check for endianness

if test "$cross_compiling" = "no"; then

support/apachectl.in

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ do 
	    fi

	else

	    if $HTTPD -t >/dev/null 2>&1; then

		if kill -@AP_SIG_GRACEFUL@ $PID ; then

		if kill -@AP_SIG_GRACEFUL_SHORT@ $PID ; then

		    echo "$0 $ARG: httpd gracefully restarted"

		else

		    echo "$0 $ARG: httpd could not be restarted"