We need to check the TTL here also, if a (sequence of) slow client(s)

manages to hold the document referenced, the prefetcher may never
get lucky with it and it will linger here much past last sell date.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@527 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index 5f753077e3c45c000fce3dab7d6f9271dc2dd9ff..77f91ae36154675215e0e51368834ab7f74822d0 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -101,12 +101,13 @@ HSH_Lookup(struct sess *sp)
                        return (NULL);
                }
        were_back:
-               /* XXX: check ttl */
                /* XXX: check Vary: */
                if (!o->cacheable) {
                        /* ignore */
                } else if (o->ttl == 0) {
                        /* Object banned but not reaped yet */
+               } else if (o->ttl < sp->t_req) {
+                       /* Object expired */
                } else if (BAN_CheckObject(o, h->url)) {
                        o->ttl = 0;
                        VSL(SLT_ExpBan, 0, "%u was banned", o->xid);