------------------------------------------------------------ revno: 12658 revision-id: squid3@treenet.co.nz-20131120005445-bjn0a9bhk8w3of4u parent: squid3@treenet.co.nz-20131120001253-ffge5dolpth1w3ng fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3960 committer: Amos Jeffries branch nick: 3.3 timestamp: Tue 2013-11-19 17:54:45 -0700 message: Bug 3960: Dead Peers Are Not Revived ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131120005445-bjn0a9bhk8w3of4u # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: e15788a151fb9d30d48f5db417bb728ea524400f # timestamp: 2013-11-20 01:53:52 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20131120001253-\ # ffge5dolpth1w3ng # # Begin patch === modified file 'src/neighbors.cc' --- src/neighbors.cc 2013-09-10 11:33:49 +0000 +++ src/neighbors.cc 2013-11-20 00:54:45 +0000 @@ -1316,6 +1316,7 @@ Comm::ConnectionPointer conn = new Comm::Connection; conn->remote = p->addresses[i]; conn->remote.SetPort(p->http_port); + conn->setPeer(p); getOutgoingAddress(NULL, conn); ++ p->testing_now;