Commit 090e84c5 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fix an oversight which disabled TTL calculation on IMS fetches.

Also make sure that objects marked uncacheable on an IMS is treated
as such.
parent c1916855
...@@ -271,7 +271,7 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo) ...@@ -271,7 +271,7 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo)
if (bo->do_esi) if (bo->do_esi)
bo->do_stream = 0; bo->do_stream = 0;
if (bo->do_pass) if (bo->do_pass || bo->uncacheable)
bo->fetch_objcore->flags |= OC_F_PASS; bo->fetch_objcore->flags |= OC_F_PASS;
assert(wrk->handling == VCL_RET_DELIVER); assert(wrk->handling == VCL_RET_DELIVER);
......
...@@ -117,6 +117,7 @@ RFC2616_Ttl(struct busyobj *bo) ...@@ -117,6 +117,7 @@ RFC2616_Ttl(struct busyobj *bo)
case 300: /* Multiple Choices */ case 300: /* Multiple Choices */
case 301: /* Moved Permanently */ case 301: /* Moved Permanently */
case 302: /* Moved Temporarily */ case 302: /* Moved Temporarily */
case 304: /* Not Modified */
case 307: /* Temporary Redirect */ case 307: /* Temporary Redirect */
case 410: /* Gone */ case 410: /* Gone */
case 404: /* Not Found */ case 404: /* Not Found */
......
...@@ -181,6 +181,7 @@ VRT_l_beresp_uncacheable(const struct vrt_ctx *ctx, unsigned a) ...@@ -181,6 +181,7 @@ VRT_l_beresp_uncacheable(const struct vrt_ctx *ctx, unsigned a)
VSLb(ctx->vsl, SLT_VCL_Error, VSLb(ctx->vsl, SLT_VCL_Error,
"Ignoring attempt to reset beresp.uncacheable"); "Ignoring attempt to reset beresp.uncacheable");
} else if (a) { } else if (a) {
VSLb(ctx->vsl, SLT_Debug, "XXXX: UNCACHEABLE %u" , a);
ctx->bo->uncacheable = a; ctx->bo->uncacheable = a;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment