Actually after reviewing this I think we want to ignore s-w-r for a -1 ttl
so new diff attached.
Yes?
On Wed, Sep 17, 2014 at 12:28 PM, Federico Schwindt <[email protected]>
wrote:
> Update diff after the discussion at vdd.
>
> This will init grace with the s-w-r value regardless of the ttl.
>
> Ok?
>
> f.-
>
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index b4e79c4..c33dfdb 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -1162,6 +1162,7 @@ unsigned RFC2616_Req_Gzip(const struct http *);
int RFC2616_Do_Cond(const struct req *sp);
void RFC2616_Weaken_Etag(struct http *hp);
void RFC2616_Vary_AE(struct http *hp);
+void RFC5861_Stale(struct busyobj *);
/* stevedore.c */
int STV_NewObject(struct objcore *, struct worker *,
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 3dbd83a..2538114 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -373,6 +373,8 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
EXP_Clr(&bo->fetch_objcore->exp);
RFC2616_Ttl(bo, now);
+ RFC5861_Stale(bo);
+
/* private objects have negative TTL */
if (bo->fetch_objcore->flags & OC_F_PRIVATE)
bo->fetch_objcore->exp.ttl = -1.;
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 99de23f..d23d810 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -275,3 +275,35 @@ RFC2616_Vary_AE(struct http *hp)
http_SetHeader(hp, "Vary: Accept-Encoding");
}
}
+
+/*
+ * RFC5861 outlines a way to control the use of stale responses.
+ * We use this to initialize the grace period.
+ */
+
+void
+RFC5861_Stale(struct busyobj *bo)
+{
+ char *p;
+ const struct http *hp;
+ struct exp *expp;
+
+ expp = &bo->fetch_objcore->exp;
+
+ /*
+ * If we are not meant to cache this ignore any potential
+ * stale-while-revalidate values.
+ */
+ if (expp->ttl < 0.)
+ return;
+
+ hp = bo->beresp;
+
+ if (http_GetHdrField(hp, H_Cache_Control,
+ "stale-while-revalidate", &p) && p != NULL) {
+ if (*p == '-')
+ expp->grace = 0;
+ else
+ expp->grace = strtoul(p, NULL, 0);
+ }
+}
diff --git a/bin/varnishtest/tests/b00043.vtc b/bin/varnishtest/tests/b00043.vtc
new file mode 100644
index 0000000..1591a03
--- /dev/null
+++ b/bin/varnishtest/tests/b00043.vtc
@@ -0,0 +1,41 @@
+varnishtest "Test stale-while-revalidate"
+
+server s1 {
+ rxreq
+ txresp -hdr "Cache-Control: max-age=30, stale-while-revalidate=30"
+ rxreq
+ txresp -hdr "Cache-Control: max-age=0, stale-while-revalidate=30"
+ rxreq
+ txresp -hdr "Cache-Control: max-age=30, stale-while-revalidate=30" -hdr "Age: 40"
+ rxreq
+ txresp -status 500 -hdr "Cache-Control: max-age=30, stale-while-revalidate=30"
+} -start
+
+varnish v1 -vcl+backend {
+ sub vcl_backend_response {
+ set beresp.http.grace = beresp.grace;
+ set beresp.http.ttl = beresp.ttl;
+ }
+} -start
+
+client c1 {
+ txreq -url /1
+ rxresp
+ expect resp.http.grace == 30.000
+ expect resp.http.ttl == 30.000
+
+ txreq -url /2
+ rxresp
+ expect resp.http.grace == 30.000
+ expect resp.http.ttl == 0.000
+
+ txreq -url /3
+ rxresp
+ expect resp.http.grace == 30.000
+ expect resp.http.ttl == -10.000
+
+ txreq -url /4
+ rxresp
+ expect resp.http.grace == 10.000
+ expect resp.http.ttl == 0.000
+} -run
_______________________________________________
varnish-dev mailing list
[email protected]
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-dev
