diff options
Diffstat (limited to 'main/squid/bug-3679.patch')
| -rw-r--r-- | main/squid/bug-3679.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/main/squid/bug-3679.patch b/main/squid/bug-3679.patch index b718093817..c9c3127320 100644 --- a/main/squid/bug-3679.patch +++ b/main/squid/bug-3679.patch @@ -1,15 +1,11 @@ -http://bugs.squid-cache.org/show_bug.cgi?id=3679 - -diff --git a/src/external_acl.cc b/src/external_acl.cc -index b3821c5..d6c4338 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc -@@ -1152,7 +1152,7 @@ external_acl_entry_expired(external_acl * def, external_acl_entry * entry) - if (def->cache_size <= 0) +@@ -1243,7 +1243,7 @@ + if (def->cache_size <= 0 || entry->result == ACCESS_DUNNO) return 1; -- if (entry->date + (entry->result == 1 ? def->ttl : def->negative_ttl) < squid_curtime) -+ if (entry->date + (entry->result == 1 ? def->ttl : def->negative_ttl) <= squid_curtime) +- if (entry->date + (entry->result == ACCESS_ALLOWED ? def->ttl : def->negative_ttl) < squid_curtime) ++ if (entry->date + (entry->result == ACCESS_ALLOWED ? def->ttl : def->negative_ttl) <= squid_curtime) return 1; else return 0; |