squid 3.4.14: Import latest patch from upstream
Message ID | 1440922404-1084-1-git-send-email-matthias.fischer@ipfire.org |
---|---|
State | Accepted |
Commit | f10a246946c3fd24f3d75f3a90bb9c86fe598e74 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.tremer.info [172.28.1.200]) by septima.ipfire.org (Postfix) with ESMTP id EEE8461386 for <patchwork@ipfire.org>; Sun, 30 Aug 2015 10:13:31 +0200 (CEST) Received: from hedwig.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 5EF2DD51; Sun, 30 Aug 2015 10:13:31 +0200 (CEST) Received: from Devel.localdomain (p5DD824A9.dip0.t-ipconnect.de [93.216.36.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id EF23616C for <development@lists.ipfire.org>; Sun, 30 Aug 2015 10:13:28 +0200 (CEST) From: Matthias Fischer <matthias.fischer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] squid 3.4.14: Import latest patch from upstream Date: Sun, 30 Aug 2015 10:13:24 +0200 Message-Id: <1440922404-1084-1-git-send-email-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.5.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Matthias Fischer
Aug. 30, 2015, 6:13 p.m. UTC
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
lfs/squid | 1 +
src/patches/squid-3.4-13228.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 src/patches/squid-3.4-13228.patch
Comments
Hi, merged this one, although I am not really sure if any IPFire user is affected by this. Patchwork somehow changed the From header of the email in a way. Any idea why? Best, -Michael On Sun, 2015-08-30 at 10:13 +0200, Matthias Fischer wrote: > Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org> > --- > lfs/squid | 1 + > src/patches/squid-3.4-13228.patch | 35 > +++++++++++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+) > create mode 100644 src/patches/squid-3.4-13228.patch > > diff --git a/lfs/squid b/lfs/squid > index d8c8a05..834df9a 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 > -3.4-13228.patch > cd $(DIR_APP) && ./configure \ > --prefix=/usr \ > --sysconfdir=/etc/squid \ > diff --git a/src/patches/squid-3.4-13228.patch b/src/patches/squid > -3.4-13228.patch > new file mode 100644 > index 0000000..7f7d16f > --- /dev/null > +++ b/src/patches/squid-3.4-13228.patch > @@ -0,0 +1,35 @@ > +------------------------------------------------------------ > +revno: 13228 > +revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg > +parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq > +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696 > +committer: Amos Jeffries <squid3@treenet.co.nz> > +branch nick: 3.4 > +timestamp: Fri 2015-08-28 06:23:34 -0700 > +message: > + Bug 3696: crash when client delay pools are activated > +------------------------------------------------------------ > +# Bazaar merge directive format 2 (Bazaar 0.90) > +# revision_id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg > +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 > +# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177 > +# timestamp: 2015-08-28 13:33:44 +0000 > +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 > +# base_revision_id: squid3@treenet.co.nz-20150801072237-\ > +# 5tzh2dczozz1e8sq > +# > +# Begin patch > +=== modified file 'src/client_side.cc' > +--- src/client_side.cc 2014-06-21 04:24:37 +0000 > ++++ src/client_side.cc 2015-08-28 13:23:34 +0000 > +@@ -3447,7 +3447,8 @@ > + > + /* pools require explicit 'allow' to assign a client > into them */ > + if (pools[pool].access) { > +- ch.accessList = pools[pool].access; > ++ cbdataReferenceDone(ch.accessList); > ++ ch.accessList = > cbdataReference(pools[pool].access); > + allow_t answer = ch.fastCheck(); > + if (answer == ACCESS_ALLOWED) { > + > +