From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid 3.5.22: latest patch (14099)
Date: Fri, 21 Oct 2016 20:30:29 +0200 [thread overview]
Message-ID: <20161021183029.1296-1-matthias.fischer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3614 bytes --]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
lfs/squid | 1 +
src/patches/squid/squid-3.5-14099.patch | 65 +++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 src/patches/squid/squid-3.5-14099.patch
diff --git a/lfs/squid b/lfs/squid
index 269c663..f6015af 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-14099.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
diff --git a/src/patches/squid/squid-3.5-14099.patch b/src/patches/squid/squid-3.5-14099.patch
new file mode 100644
index 0000000..0e10eff
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14099.patch
@@ -0,0 +1,65 @@
+------------------------------------------------------------
+revno: 14099
+revision-id: squid3(a)treenet.co.nz-20161015042024-jagzafukd2t6gcr0
+parent: squid3(a)treenet.co.nz-20161009195739-pcju9hl8vqwijt26
+author: Alex Rousskov <rousskov(a)measurement-factory.com>
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.5
+timestamp: Sat 2016-10-15 17:20:24 +1300
+message:
+ Fix build with eCAP but without ICAP support.
+
+ That is, when ./configured with --enable-ecap --disable-icap-client.
+
+ AccessLogEntry::icap requires ICAP_CLIENT, not just USE_ADAPTATION.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20161015042024-jagzafukd2t6gcr0
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 4cd2e7bf4e2be0acd252963afc107537b17450fc
+# timestamp: 2016-10-15 04:52:07 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3(a)treenet.co.nz-20161009195739-\
+# pcju9hl8vqwijt26
+#
+# Begin patch
+=== modified file 'src/format/Format.cc'
+--- src/format/Format.cc 2016-09-16 11:53:28 +0000
++++ src/format/Format.cc 2016-10-15 04:20:24 +0000
+@@ -318,7 +318,7 @@
+ actualReplyHeader(const AccessLogEntry::Pointer &al)
+ {
+ const HttpMsg *msg = al->reply;
+-#if USE_ADAPTATION
++#if ICAP_CLIENT
+ // al->icap.reqMethod is methodNone in access.log context
+ if (!msg && al->icap.reqMethod == Adaptation::methodReqmod)
+ msg = al->adapted_request;
+@@ -331,7 +331,7 @@
+ static const HttpMsg *
+ actualRequestHeader(const AccessLogEntry::Pointer &al)
+ {
+-#if USE_ADAPTATION
++#if ICAP_CLIENT
+ // al->icap.reqMethod is methodNone in access.log context
+ if (al->icap.reqMethod == Adaptation::methodRespmod) {
+ // XXX: for now AccessLogEntry lacks virgin response headers
+@@ -819,7 +819,7 @@
+ break;
+
+ case LFT_REQUEST_ALL_HEADERS:
+-#if USE_ADAPTATION
++#if ICAP_CLIENT
+ if (al->icap.reqMethod == Adaptation::methodRespmod) {
+ // XXX: since AccessLogEntry::Headers lacks virgin response
+ // headers, do nothing for now
+@@ -843,7 +843,7 @@
+
+ case LFT_REPLY_ALL_HEADERS:
+ out = al->headers.reply;
+-#if USE_ADAPTATION
++#if ICAP_CLIENT
+ if (!out && al->icap.reqMethod == Adaptation::methodReqmod)
+ out = al->headers.adapted_request;
+ #endif
+
--
2.10.1
reply other threads:[~2016-10-21 18:30 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=20161021183029.1296-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