Look for s-maxage before max-age. This may need to be revisited.

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

diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index be56c743b8af1821d1295593f2a38707c4b78124..ac46209c4db1cc94894e8bf01aea6d2171d8abd9 100644 (file)
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -109,7 +109,8 @@ RFC2616_Ttl(struct sess *sp, struct http *hp, struct object *obj)
        retirement_age = INT_MAX;
 
        u1 = u2 = 0;
-       if (http_GetHdrField(hp, H_Cache_Control, "max-age", &p)) {
+       if (http_GetHdrField(hp, H_Cache_Control, "s-maxage", &p) ||
+           http_GetHdrField(hp, H_Cache_Control, "max-age", &p)) {
                u1 = strtoul(p, NULL, 0);
                u2 = 0;
                if (http_GetHdr(hp, H_Age, &p)) {