[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7b8f3631a06be63646d09a8d6540f866d39a56f

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7b8f3631a06be63646d09a8d6540f866d39a56f

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2005 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c7b8f3631a06be63646d09a8d6540f866d39a56f (commit)
      from  2005b34809f4d8c4aeb64fcb800b4111610fda62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7b8f3631a06be63646d09a8d6540f866d39a56f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Nov 27 11:24:00 2023 +0000

    apache2: Properly re-execute Apache on restart
    
    Previously, we sent Apache a signal to relaunch itself which caused
    Apache to kill all child processes, and re-execute them.
    
    However, when updating glibc, any newly compiled modules could not be
    loaded as Apache was running with the previous version of glibc until
    the next reboot.
    
    This change will now properly stop Apache and restart it which solves
    this problem.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/apache | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 0f4fe4a71..18eb86e2f 100644
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -86,14 +86,13 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping Apache daemon..."
-		killproc /usr/sbin/httpd
+		/usr/sbin/apachectl -k stop
 		evaluate_retval
 		;;
 
 	restart)
-		boot_mesg "Restarting Apache daemon..."
-		/usr/sbin/apachectl -k restart
-		evaluate_retval
+		$0 stop
+		$0 start
 		;;
 
 	reload)


hooks/post-receive
--
IPFire 2.x development tree