diff --git a/httpd.service b/httpd.service index 52502b8..2dc16b9 100644 --- a/httpd.service +++ b/httpd.service @@ -24,7 +24,7 @@ Environment=LANG=C ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND ExecReload=/usr/sbin/httpd $OPTIONS -k graceful -ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop +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 diff --git a/httpd.spec b/httpd.spec index b4f4063..9efad60 100644 --- a/httpd.spec +++ b/httpd.spec @@ -14,7 +14,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.6 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -623,9 +623,12 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog -* Thu Oct 31 2013 Joe Orton - 2.4.6-5 +* Thu Oct 31 2013 Joe Orton - 2.4.6-6 - mod_ssl: allow SSLEngine to override Listen-based default (r1537535) +* Thu Oct 24 2013 Jan kaluza - 2.4.6-5 +- systemd: send SIGWINCH signal without httpd -k in ExecStop + * Mon Oct 21 2013 Joe Orton - 2.4.6-4 - load mod_macro by default (#998452) - add README to conf.modules.d