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

[Michael Tremer <git@ipfire.org>]

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  60551d777c014d15718566a408817e0d5398ab33 (commit)
      from  83b3ae2ff83d647cb1ead1e902b4dce123474e4c (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 60551d777c014d15718566a408817e0d5398ab33
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Nov 7 11:20:33 2025 +0100

    squid: Don't forcibly kill any redirectory processes
    
    This is a race which might cause that when squidGuard pre-compiles any
    data, it will be killed too. If that happens, squid will keep forking
    squidGuard processes which will be unresponsive (because they are trying
    to compile they own databases) and the whole system will become
    unresponsive at some point.
    
    There should be no need to perform this action.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/199/filelists/files | 1 +
 src/initscripts/system/squid              | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files
index 369c39914..d04204f4a 100644
--- a/config/rootfiles/core/199/filelists/files
+++ b/config/rootfiles/core/199/filelists/files
@@ -3,6 +3,7 @@ etc/rc.d/init.d/messagebus
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/openvpn-n2n
 etc/rc.d/init.d/openvpn-rw
+etc/rc.d/init.d/squid
 etc/rc.d/init.d/wireguard
 etc/rc.d/rc0.d/K85messagebus
 etc/rc.d/rc3.d/S15messagebus
diff --git a/src/initscripts/system/squid b/src/initscripts/system/squid
index d45734334..075f160c4 100644
--- a/src/initscripts/system/squid
+++ b/src/initscripts/system/squid
@@ -149,13 +149,6 @@ case "$1" in
 
 				echo_ok
 			fi
-
-			# Kill any redirector processes that might have been left running
-			killproc /usr/bin/squidGuard >/dev/null &
-			killproc /usr/sbin/updxlrator >/dev/null &
-			killproc /usr/bin/squidclamav >/dev/null &
-			killproc /usr/sbin/redirect_wrapper >/dev/null &
-			wait
 		fi
 
 		# Trash remain pid file from squid.


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