From c0d77ab6a4bdf0c18fa1084afa2c8a425bb12c94 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 16 Apr 2013 16:10:30 +0200
Subject: httpd: sync with rawhide

---
 httpd.conf    | 14 ++++++++------
 httpd.service |  6 ++++++
 httpd.spec    | 11 ++++++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/httpd.conf b/httpd.conf
index fc7bf34..a7af0dc 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -315,12 +315,14 @@ LogLevel warn
 #
 AddDefaultCharset UTF-8
 
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-MIMEMagicFile conf/magic
+<IfModule mime_magic_module>
+    #
+    # The mod_mime_magic module allows the server to use various hints from the
+    # contents of the file itself to determine its type.  The MIMEMagicFile
+    # directive tells the module where the hint definitions are located.
+    #
+    MIMEMagicFile conf/magic
+</IfModule>
 
 #
 # Customizable error responses come in three flavors:
diff --git a/httpd.service b/httpd.service
index b176a92..307666c 100644
--- a/httpd.service
+++ b/httpd.service
@@ -8,6 +8,12 @@ EnvironmentFile=/etc/sysconfig/httpd
 ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
 ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
 ExecStop=/usr/sbin/httpd $OPTIONS -k graceful-stop
+# 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
 PrivateTmp=true
 
 [Install]
diff --git a/httpd.spec b/httpd.spec
index 9506cda..da15cb6 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -626,6 +626,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Apr 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.4.4-4
+- sync with rawhide, rebuild for remi repo
+
+* Tue Apr 16 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-4
+- fix service file to not send SIGTERM after ExecStop (#906321, #912288)
+
+* Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
+- protect MIMEMagicFile with IfModule (#893949)
+
 * Sat Mar  9 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.4.4-2
 - sync with rawhide, update to 2.4.4, rebuild for remi repo
 
-- 
cgit