diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-02-19 16:12:10 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-02-19 16:15:08 +0200 |
| commit | 73ec341175192419c272cfe4e5077c443cdbf606 (patch) | |
| tree | 68b42aa33e5db9cdbd92f0e254c781115bd27659 /main/squid/bug-3679.patch | |
| parent | 533635578432d59ba3c58c7f3d304648cff76b30 (diff) | |
| download | aports-fcolista-73ec341175192419c272cfe4e5077c443cdbf606.tar.bz2 aports-fcolista-73ec341175192419c272cfe4e5077c443cdbf606.tar.xz | |
main/squid: reapply the patches that are still needed
This reverts parts of commit 2b193486e27c9f848a9577fd9f75c1e105d48b76.
Only the bug-3679.patch was merged upstream, so only it should've been
removed.
Diffstat (limited to 'main/squid/bug-3679.patch')
| -rw-r--r-- | main/squid/bug-3679.patch | 15 |
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; |