]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/squid/squid-3.5-14121.patch
squid 3.5.22: latest patches (14119-14122)
[people/pmueller/ipfire-2.x.git] / src / patches / squid / squid-3.5-14121.patch
1 ------------------------------------------------------------
2 revno: 14121
3 revision-id: squid3@treenet.co.nz-20161209043304-krtzvsm4a0zbzgi8
4 parent: squid3@treenet.co.nz-20161209034636-wytrnx7ks2jv0sxt
5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4406
6 author: Michael Buchau <mike@m-buchau.de>
7 committer: Amos Jeffries <squid3@treenet.co.nz>
8 branch nick: 3.5
9 timestamp: Fri 2016-12-09 17:33:04 +1300
10 message:
11 Bug 4406: SIGSEV in TunnelStateData::handleConnectResponse() during reconfigure and restart
12 ------------------------------------------------------------
13 # Bazaar merge directive format 2 (Bazaar 0.90)
14 # revision_id: squid3@treenet.co.nz-20161209043304-krtzvsm4a0zbzgi8
15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
16 # testament_sha1: ce1153061cb79ac9ede6851f438ec830ed7a3e78
17 # timestamp: 2016-12-09 04:51:01 +0000
18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
19 # base_revision_id: squid3@treenet.co.nz-20161209034636-\
20 # wytrnx7ks2jv0sxt
21 #
22 # Begin patch
23 === modified file 'src/tunnel.cc'
24 --- src/tunnel.cc 2016-08-17 13:34:13 +0000
25 +++ src/tunnel.cc 2016-12-09 04:33:04 +0000
26 @@ -475,7 +475,8 @@
27 *status_ptr = rep.sline.status();
28
29 // we need to relay the 401/407 responses when login=PASS(THRU)
30 - const char *pwd = server.conn->getPeer()->login;
31 + const CachePeer *peer = server.conn->getPeer();
32 + const char *pwd = (peer ? peer->login : NULL);
33 const bool relay = pwd && (strcmp(pwd, "PASS") == 0 || strcmp(pwd, "PASSTHRU") == 0) &&
34 (*status_ptr == Http::scProxyAuthenticationRequired ||
35 *status_ptr == Http::scUnauthorized);
36