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

Merge.

Browse Source
This commit is contained in:
Joe Orton 2013-10-31 16:04:17 +00:00
commit 8de85ede52
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpd.service
View File

@ -24,7 +24,7 @@ Environment=LANG=C
ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
ExecReload=/usr/sbin/httpd $OPTIONS -k graceful 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 # 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 # it to kill httpd after TimeoutStopSec if something went wrong during the
# graceful stop. Normally, Systemd sends SIGTERM signal right after the # graceful stop. Normally, Systemd sends SIGTERM signal right after the

7
httpd.spec
View File

@ -14,7 +14,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.6 Version: 2.4.6
Release: 5%{?dist} Release: 6%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -623,9 +623,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-5 * Thu Oct 31 2013 Joe Orton <jorton@redhat.com> - 2.4.6-6
- mod_ssl: allow SSLEngine to override Listen-based default (r1537535) - mod_ssl: allow SSLEngine to override Listen-based default (r1537535)
* Thu Oct 24 2013 Jan kaluza <jkaluza@redhat.com> - 2.4.6-5
- systemd: send SIGWINCH signal without httpd -k in ExecStop
* Mon Oct 21 2013 Joe Orton <jorton@redhat.com> - 2.4.6-4 * Mon Oct 21 2013 Joe Orton <jorton@redhat.com> - 2.4.6-4
- load mod_macro by default (#998452) - load mod_macro by default (#998452)
- add README to conf.modules.d - add README to conf.modules.d