aboutsummaryrefslogtreecommitdiffstats
path: root/main/squid/bug-3679.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-01-17 14:02:08 +0200
committerTimo Teräs <timo.teras@iki.fi>2013-01-17 14:08:41 +0200
commit620c21a583decc9690be4e0e5121b348589baeec (patch)
tree01734a3707c2ade9729a3091b29fb77c003ed7ec /main/squid/bug-3679.patch
parent6b6eab1412098dfafd4a08dbb53ff51561147fa3 (diff)
downloadaports-620c21a583decc9690be4e0e5121b348589baeec.tar.bz2
aports-620c21a583decc9690be4e0e5121b348589baeec.tar.xz
main/squid: apply two external acl bugfixes from bugtracker
Diffstat (limited to 'main/squid/bug-3679.patch')
-rw-r--r--main/squid/bug-3679.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/main/squid/bug-3679.patch b/main/squid/bug-3679.patch
new file mode 100644
index 0000000000..b718093817
--- /dev/null
+++ b/main/squid/bug-3679.patch
@@ -0,0 +1,15 @@
+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)
+ 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)
+ return 1;
+ else
+ return 0;