Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

diff --git a/lfs/squid b/lfs/squid
index ceaddac86e23dbdd676a16e0b29bccd65dec82cc..e1439cf917180f79d3e86f61137194de684e3421 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/02_dont_treat_connect_rejections_as_peer_problems.patch
 
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi

diff --git a/src/patches/squid/02_dont_treat_connect_rejections_as_peer_problems.patch b/src/patches/squid/02_dont_treat_connect_rejections_as_peer_problems.patch
new file mode 100644 (file)
index 0000000..5789673
--- /dev/null
+++ b/src/patches/squid/02_dont_treat_connect_rejections_as_peer_problems.patch
@@ -0,0 +1,14 @@
+diff -U 3 a/src/clients/HttpTunneler.cc b/src/clients/HttpTunneler.cc
+--- a/src/clients/HttpTunneler.cc      Sat Feb 12 04:47:05 2022
++++ b/src/clients/HttpTunneler.cc      Wed Feb 16 18:15:42 2022
+@@ -389,8 +389,8 @@
+ Http::Tunneler::countFailingConnection()
+ {
+     assert(connection);
+-    if (const auto p = connection->getPeer())
+-        peerConnectFailed(p);
++//    if (const auto p = connection->getPeer())
++//        peerConnectFailed(p);
+     if (noteFwdPconnUse && connection->isOpen())
+         fwdPconnPool->noteUses(fd_table[connection->fd].pconn.uses);
+ }