diff options
| author |   Donny Davies <woodchip@gentoo.org> | 2003-02-25 21:56:56 +0000 |
|---|---|---|
| committer | Donny Davies <woodchip@gentoo.org> | 2003-02-25 21:56:56 +0000 |
| commit | 08335f894b9a63b069871dce4720c40ec10cc0e8 (patch) | |
| tree | 9b7eb8f52bc320ef3b6138e3334b6f48d87eb174 /net-www/apache | |
| parent | Filter out -Os and replace with -O2. Closes #12644. (diff) | |
| download | gentoo-2-08335f894b9a63b069871dce4720c40ec10cc0e8.tar.gz gentoo-2-08335f894b9a63b069871dce4720c40ec10cc0e8.tar.bz2 gentoo-2-08335f894b9a63b069871dce4720c40ec10cc0e8.zip | |
#16326; send USR1 only to parent
Diffstat (limited to 'net-www/apache')
| -rw-r--r-- | net-www/apache/ChangeLog | 5 | ||||
| -rw-r--r-- | net-www/apache/files/2.0.40/apache2.initd | 25 | ||||
| -rw-r--r-- | net-www/apache/files/apache.rc6 | 25 |
3 files changed, 40 insertions, 15 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 02fd12df2b6b..2a25be6d39a6 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-www/apache # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.44 2003/02/24 20:06:29 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.45 2003/02/25 21:56:56 woodchip Exp $ + + 25 Feb 2003; Donny Davies <woodchip@gentoo.org> apache.rc6, apache2.initd : + Send USR1 signal only to parent in reload(); #16326. *apache-1.3.27-r4 (23 Feb 2003) diff --git a/net-www/apache/files/2.0.40/apache2.initd b/net-www/apache/files/2.0.40/apache2.initd index c3f139638eb2..d7461a61d1d2 100644 --- a/net-www/apache/files/2.0.40/apache2.initd +++ b/net-www/apache/files/2.0.40/apache2.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.initd,v 1.6 2003/02/23 19:39:22 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.40/apache2.initd,v 1.7 2003/02/25 21:56:56 woodchip Exp $ opts="${opts} reload" @@ -27,12 +27,23 @@ stop() { reload() { ebegin "Gracefully restarting apache2" /usr/sbin/apache2 -t ${APACHE2_OPTS} &>/dev/null - if [ "$?" != "0" ]; then - svc_stop - eend 1 "Apache2 configuration error" + if [ "$?" = "0" ] + then + if [ -f /var/run/apache2.pid ] + then + kill -USR1 $(</var/run/apache2.pid) + eend $? + else + svc_start + eend $? + fi else - killall -USR1 apache2 &> /dev/null - svc_start &>/dev/null - eend $? + if [ -f /var/run/apache2.pid ] + then + svc_stop + fi + #show the error(s) + /usr/sbin/apache2 -t ${APACHE2_OPTS} + eend 1 fi } diff --git a/net-www/apache/files/apache.rc6 b/net-www/apache/files/apache.rc6 index 09e106ad1492..0bac9b4fdacc 100644 --- a/net-www/apache/files/apache.rc6 +++ b/net-www/apache/files/apache.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.10 2003/02/23 19:39:22 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.11 2003/02/25 21:56:56 woodchip Exp $ opts="${opts} reload" @@ -27,12 +27,23 @@ stop() { reload() { ebegin "Gracefully restarting apache" /usr/sbin/apache -t ${APACHE_OPTS} &>/dev/null - if [ "$?" != "0" ]; then - svc_stop - eend 1 "Apache configuration error" + if [ "$?" = "0" ] + then + if [ -f /var/run/apache.pid ] + then + kill -USR1 $(</var/run/apache.pid) + eend $? + else + svc_start + eend $? + fi else - killall -USR1 apache &> /dev/null - svc_start &>/dev/null - eend $? + if [ -f /var/run/apache.pid ] + then + svc_stop + fi + #show the error(s) + /usr/sbin/apache -t ${APACHE_OPTS} + eend 1 fi } |