rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

apachectl: in graceful/graceful-stop, only signal main process (#1758798)

Browse Source 
Resolves: rhbz#1758798
This commit is contained in:
Joe Orton 2019-11-13 17:39:53 +00:00
parent 087f93d480
commit 9d23b8bc3a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apachectl.sh
View File

@ -39,14 +39,14 @@ start|stop|restart|status)
;; ;;
graceful) graceful)
if /usr/bin/systemctl -q is-active $SVC; then if /usr/bin/systemctl -q is-active $SVC; then
/usr/bin/systemctl kill --signal=SIGUSR1 $SVC /usr/bin/systemctl kill --signal=SIGUSR1 --kill-who=main $SVC
else else
/usr/bin/systemctl start $SVC /usr/bin/systemctl start $SVC
fi fi
ERROR=$? ERROR=$?
;; ;;
graceful-stop) graceful-stop)
/usr/bin/systemctl kill --signal=SIGWINCH $SVC /usr/bin/systemctl kill --signal=SIGWINCH --kill-who=main $SVC
ERROR=$? ERROR=$?
;; ;;
configtest|-t) configtest|-t)

5
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.41 Version: 2.4.41
Release: 7%{?dist} Release: 8%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@ -747,6 +747,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Wed Nov 13 2019 Joe Orton <jorton@redhat.com> - 2.4.41-8
- apachectl: in graceful/graceful-stop, only signal main process (#1758798)
* Mon Nov 11 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.41-7 * Mon Nov 11 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.41-7
- add automatic source tarball signature verification in %prep section - add automatic source tarball signature verification in %prep section