r1386 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-05-05 16:44:37 +0200 (Sat, 05 May 2007)
New Revision: 1386

Modified:
   trunk/varnish-cache/bin/varnishd/rfc2616.c
Log:
Look for s-maxage before max-age.  This may need to be revisited.


Modified: trunk/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/rfc2616.c	2007-05-05 14:35:58 UTC (rev 1385)
+++ trunk/varnish-cache/bin/varnishd/rfc2616.c	2007-05-05 14:44:37 UTC (rev 1386)
@@ -109,7 +109,8 @@
 	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)) {