commit 36930381bc186af121a2439f92b8fe2c2c6f3acc
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Mon Sep 1 09:32:54 2014 +0200
use KillMode=mixed in httpd.service (#1135122)
httpd.service | 10 +++-------
httpd.spec | 5 ++++-
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/httpd.service b/httpd.service
index 04c43e2..f7a01e4 100644
--- a/httpd.service
+++ b/httpd.service
@@ -24,13 +24,9 @@ Environment=LANG=C
ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
-ExecStop=/bin/kill -WINCH ${MAINPID}
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
+# Send SIGWINCH for graceful stop
+KillSignal=SIGWINCH
+KillMode=mixed
PrivateTmp=true
[Install]
diff --git a/httpd.spec b/httpd.spec
index a68b852..68683b1 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.10
-Release: 9%{?dist}
+Release: 10%{?dist}
URL:
http://httpd.apache.org/
Source0:
http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -669,6 +669,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Mon Sep 01 2014 Jan Kaluza <jkaluza(a)redhat.com> - 2.4.10-10
+- use KillMode=mixed in httpd.service (#1135122)
+
* Fri Aug 29 2014 Joe Orton <jorton(a)redhat.com> - 2.4.10-9
- set vstring based on /etc/os-release (Pat Riehecky, #1114539)