diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2001-09-18 22:13:59 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2001-09-18 22:13:59 +0000 |
| commit | a8a56e00c5425a3c6e416733a6bdf65c6b9776a5 (patch) | |
| tree | 5e4e1df838fba51dec06b676186f556e92febb0b /support/apachectl.in | |
| parent | 3f8dd5a6411090ef7f9ad1f29aa2b811241ae707 (diff) | |
| download | httpd-a8a56e00c5425a3c6e416733a6bdf65c6b9776a5.tar.gz | |
Switch back to SIGUSR1 for graceful restarts on all platforms that
support it. This defines a symbol called AP_SIG_GRACEFUL in
ap_config_auto.h which will have the appropriate signal value. All
direct references to SIGWINCH have been replaced with AP_SIG_GRACEFUL.
On Linux 2.0, use SIGWINCH instead since SIGUSR1 is used by glibc
2.0's user-space threading library to control threads. All later
versions of Linux/glibc don't have this problem. (Not to mention the
security holes in older Linux versions which make it unsuitable for
use as a web server.) If your platform doesn't have SIGUSR1, use the
appropriate mojo in configure to define what your graceful restart
signal should be.
In theory, a configure switch could be added to allow the admin to
specify the appropriate signal that should be used. This is left
as an exercise to the reader for now.
The docs need to be updated. Since the signal is now configurable,
just saying SIGUSR1 for graceful restart isn't completely true. Also,
the apachectl functionality needs to be moved into httpd - this is
what Win32 does and it makes us consistent across platforms.
Roy issued a veto against use of SIGWINCH by default, so this should
resolve that veto.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91076 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/apachectl.in')
| -rw-r--r-- | support/apachectl.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/apachectl.in b/support/apachectl.in index cce5c9e7eb..c37f275d98 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 -WINCH $PID ; then + if kill -@AP_SIG_GRACEFUL@ $PID ; then echo "$0 $ARG: httpd gracefully restarted" else echo "$0 $ARG: httpd could not be restarted" @@ -161,7 +161,7 @@ restart - restart httpd if running by sending a SIGHUP or start if not running fullstatus - dump a full status screen; requires lynx and mod_status enabled status - dump a short status screen; requires lynx and mod_status enabled -graceful - do a graceful restart by sending a SIGWINCH or start if not running +graceful - do a graceful restart by sending a @AP_SIG_GRACEFUL@ or start if not running configtest - do a configuration syntax test help - this screen |