diff options
Diffstat (limited to 'source/n/httpd')
-rwxr-xr-x | source/n/httpd/httpd.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/httpd/httpd.url | 4 | ||||
-rw-r--r-- | source/n/httpd/rc.httpd | 25 |
3 files changed, 17 insertions, 14 deletions
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..ccd121e91 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url index 9dc6266cb..c60672025 100644 --- a/source/n/httpd/httpd.url +++ b/source/n/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.48.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.48.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.59.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.59.tar.bz2.asc diff --git a/source/n/httpd/rc.httpd b/source/n/httpd/rc.httpd index 6b251d90d..afacffb34 100644 --- a/source/n/httpd/rc.httpd +++ b/source/n/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 |