From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid 3.5.20: latest patches
Date: Fri, 12 Aug 2016 21:09:08 +0200 [thread overview]
Message-ID: <20160812190908.3156-1-matthias.fischer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4260 bytes --]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
lfs/squid | 3 +-
...=> squid-3.5.20-fix-max-file-descriptors.patch} | 4 +-
src/patches/squid/squid-3.5-14070.patch | 44 ++++++++++++++++++++++
3 files changed, 48 insertions(+), 3 deletions(-)
rename src/patches/{squid-3.5.17-fix-max-file-descriptors.patch => squid-3.5.20-fix-max-file-descriptors.patch} (92%)
create mode 100644 src/patches/squid/squid-3.5-14070.patch
diff --git a/lfs/squid b/lfs/squid
index a88f0c5..c07afe8 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -73,7 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14067.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14068.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14069.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14070.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.20-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch b/src/patches/squid-3.5.20-fix-max-file-descriptors.patch
similarity index 92%
rename from src/patches/squid-3.5.17-fix-max-file-descriptors.patch
rename to src/patches/squid-3.5.20-fix-max-file-descriptors.patch
index b0efa76..b740b61 100644
--- a/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
+++ b/src/patches/squid-3.5.20-fix-max-file-descriptors.patch
@@ -1,6 +1,6 @@
--- configure.ac.~ Wed Apr 20 14:26:07 2016
+++ configure.ac Fri Apr 22 17:20:46 2016
-@@ -3131,6 +3131,9 @@
+@@ -3135,6 +3135,9 @@
;;
esac
@@ -10,7 +10,7 @@
dnl --with-maxfd present for compatibility with Squid-2.
dnl undocumented in ./configure --help to encourage using the Squid-3 directive
AC_ARG_WITH(maxfd,,
-@@ -3161,8 +3164,6 @@
+@@ -3165,8 +3168,6 @@
esac
])
diff --git a/src/patches/squid/squid-3.5-14070.patch b/src/patches/squid/squid-3.5-14070.patch
new file mode 100644
index 0000000..5fcc39f
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14070.patch
@@ -0,0 +1,44 @@
+------------------------------------------------------------
+revno: 14070
+revision-id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx
+parent: squidadm(a)squid-cache.org-20160723121351-iuc8hwstrqd0l1dv
+author: Christos Tsantilas <chtsanti(a)users.sourceforge.net>
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.5
+timestamp: Sat 2016-08-06 02:59:33 +1200
+message:
+ Squid segfault via Ftp::Client::readControlReply().
+
+ Ftp::Client::scheduleReadControlReply(), which may called from the
+ asynchronous start() or readControlReply()/handleControlReply()
+ handlers, does not check whether the control connection is still usable
+ before using it.
+
+ This is a Measurement Factory project.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160805145933-0cpyy47o8955lamx
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 1c21ce821f9cbc22b3e8ff2b1029f7084b5f0643
+# timestamp: 2016-08-05 15:00:22 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squidadm(a)squid-cache.org-20160723121351-\
+# iuc8hwstrqd0l1dv
+#
+# Begin patch
+=== modified file 'src/clients/FtpClient.cc'
+--- src/clients/FtpClient.cc 2016-02-19 23:15:41 +0000
++++ src/clients/FtpClient.cc 2016-08-05 14:59:33 +0000
+@@ -314,6 +314,11 @@
+ /* We've already read some reply data */
+ handleControlReply();
+ } else {
++
++ if (!Comm::IsConnOpen(ctrl.conn)) {
++ debugs(9, 3, "cannot read without ctrl " << ctrl.conn);
++ return;
++ }
+ /*
+ * Cancel the timeout on the Data socket (if any) and
+ * establish one on the control socket.
+
--
2.9.2
next reply other threads:[~2016-08-12 19:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 19:09 Matthias Fischer [this message]
2016-08-18 16:04 Matthias Fischer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160812190908.3156-1-matthias.fischer@ipfire.org \
--to=matthias.fischer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox