2 files changed, 16 insertions, 13 deletions
diff --git a/patches/source/httpd/httpd.url b/patches/source/httpd/httpd.url
index a6083e679..fdbabad99 100644
--- a/patches/source/httpd/httpd.url
+++ b/patches/source/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.57.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.58.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.58.tar.bz2.asc
diff --git a/patches/source/httpd/rc.httpd b/patches/source/httpd/rc.httpd
index 6b251d90d..afacffb34 100644
--- a/patches/source/httpd/rc.httpd
+++ b/patches/source/httpd/rc.httpd
@@ -2,7 +2,7 @@
 #
 # /etc/rc.d/rc.httpd
 #
-# Start/stop/restart/graceful[ly restart]/graceful[ly]-stop
+# Start/stop/force-restart/restart/graceful[ly restart]/graceful[ly]-stop
 # the Apache (httpd) web server.
 #
 # To make Apache start automatically at boot, make this
@@ -15,17 +15,20 @@ case "$1" in
     /usr/sbin/apachectl -k start
   ;;
   'stop')
-    /usr/sbin/apachectl -k stop
-    pkill -f /usr/sbin/httpd
-    # Remove both old and new .pid locations:
-    rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid
+    if [ ! -r /run/httpd.pid ]; then
+      pkill -f /usr/sbin/httpd
+    else
+      /usr/sbin/apachectl -k stop
+    fi
+    pwait -f /usr/sbin/httpd
   ;;
   'force-restart')
-    # Because sometimes restarting through apachectl just doesn't do the trick...
-    /usr/sbin/apachectl -k stop
-    pkill -f /usr/sbin/httpd
-    # Remove both old and new .pid locations:
-    rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid
+    if [ ! -r /run/httpd.pid ]; then
+      pkill -f /usr/sbin/httpd
+    else
+      /usr/sbin/apachectl -k stop
+    fi
+    pwait -f /usr/sbin/httpd
     /usr/sbin/apachectl -k start
   ;;
   'restart')
@@ -38,7 +41,7 @@ case "$1" in
     /usr/sbin/apachectl -k graceful-stop
   ;;
   *)
-    echo "Usage: $0 {start|stop|restart|graceful|graceful-stop}"
+    echo "Usage: $0 {start|stop|force-restart|restart|graceful|graceful-stop}"
   ;;
 esac