------------------------------------------------------------
revno: 13064
revision-id: squid3@treenet.co.nz-20131225213607-1zrjkv81ct0nikkz
parent: squid3@treenet.co.nz-20131225213515-aig41kdd0c1dbv9r
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3985
author: Jakob Bohm <jb-debbugs@wisemo.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Wed 2013-12-25 14:36:07 -0700
message:
  Bug 3985: 60s limit introduced by balance_on_multiple_ip breaks bad IP recovery
  
  Alternative fix if necessary would be to calculate a dynamic timeout
  value based on number and timeouts for connections and forwarding.
  
  However, as noted in the bug report the address markings are reset every
  TTL when the stored RR are replaced. This meets the criteria for 
  periodic
  retries of marked-BAD IPs. Also if all IPs are marked BAD they all get
  un-marked and retried. So for now just remove the TTL hack.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131225213607-1zrjkv81ct0nikkz
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: c65239a760a72cc2f9d72310572005bb208ee3a0
# timestamp: 2013-12-25 21:36:56 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131225213515-\
#   aig41kdd0c1dbv9r
# 
# Begin patch
=== modified file 'src/ipcache.cc'
--- src/ipcache.cc	2013-06-03 14:05:16 +0000
+++ src/ipcache.cc	2013-12-25 21:36:07 +0000
@@ -1071,7 +1071,6 @@
     if (!ia->bad_mask[k]) {
         ia->bad_mask[k] = TRUE;
         ++ia->badcount;
-        i->expires = min(squid_curtime + max((time_t)60, Config.negativeDnsTtl), i->expires);
         debugs(14, 2, "ipcacheMarkBadAddr: " << name << " " << addr );
     }