From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Sat, 24 Jun 2006 21:42:27 +0000 (+0000)
Subject: Truncate TTLs in the past to now.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10e4e404bb9d81a7e9124d2a3973618f9ed6923b;p=varnish

Truncate TTLs in the past to now.


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

diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index 18944736..3e3c9d17 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -80,7 +80,9 @@ RFC2616_Ttl(struct http *hp, time_t t_req, time_t t_resp)
 		ttl = h_expires;
 	if (ttl == 0)
 		ttl = t_resp + heritage.default_ttl;
-	printf("TTL: %d (+%d)\n", ttl, ttl - t_resp);
+	printf("TTL: %d (%+d)\n", ttl, ttl - t_resp);
+	if (ttl < t_resp)
+		return (t_resp);
 
 	return (ttl);
 }