From c43a22448395f39852897d9043641323ef86fc83 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Fri, 21 Sep 2001 14:57:43 +0000 Subject: [PATCH] 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 --- configure.in | 13 +++++++++---- support/apachectl.in | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 6c5a809a13..bce59dac83 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/support/apachectl.in b/support/apachectl.in index c37f275d98..8d0043bdd8 100644 --- a/support/apachectl.in +++ b/support/apachectl.in @@ -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" -- 2.50.1