From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid 3.5.23: latest patch (14129)
Date: Tue, 27 Dec 2016 21:55:46 +0100 [thread overview]
Message-ID: <20161227205546.14756-1-matthias.fischer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2998 bytes --]
Seems to be a serious one.
"Bug #3940 pt2: Make 'cache deny' do what is documented".
(Duplicate of Bug 3783)
For details see:
http://bugs.squid-cache.org/show_bug.cgi?id=3940
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
lfs/squid | 1 +
src/patches/squid/squid-3.5-14129.patch | 41 +++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 src/patches/squid/squid-3.5-14129.patch
diff --git a/lfs/squid b/lfs/squid
index db02367e5..00152080c 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14129.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.23-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
diff --git a/src/patches/squid/squid-3.5-14129.patch b/src/patches/squid/squid-3.5-14129.patch
new file mode 100644
index 000000000..b930aca91
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14129.patch
@@ -0,0 +1,41 @@
+------------------------------------------------------------
+revno: 14129
+revision-id: squid3(a)treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
+parent: squid3(a)treenet.co.nz-20161216043137-lsk9s4fq21sqsdfo
+fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3940
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.5
+timestamp: Mon 2016-12-26 15:22:00 +1300
+message:
+ Bug 3940 pt2: Make 'cache deny' do what is documented
+
+ Instead of overriding whatever cacheability was previously set to
+ (including changing non-cacheables to be cacheable) actually
+ prevent both cache read and write.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 579020c4bb34961317f8fd0498393aba4a797b14
+# timestamp: 2016-12-26 02:23:14 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3(a)treenet.co.nz-20161216043137-\
+# lsk9s4fq21sqsdfo
+#
+# Begin patch
+=== modified file 'src/client_side_request.cc'
+--- src/client_side_request.cc 2016-09-23 15:28:42 +0000
++++ src/client_side_request.cc 2016-12-26 02:22:00 +0000
+@@ -1407,7 +1407,10 @@
+ ClientRequestContext::checkNoCacheDone(const allow_t &answer)
+ {
+ acl_checklist = NULL;
+- http->request->flags.cachable = (answer == ACCESS_ALLOWED);
++ if (answer == ACCESS_DENIED) {
++ http->request->flags.noCache = true; // dont read reply from cache
++ http->request->flags.cachable = false; // dont store reply into cache
++ }
+ http->doCallouts();
+ }
+
+
--
2.11.0
reply other threads:[~2016-12-27 20:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20161227205546.14756-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