Commit 9aa7fae2 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Busyobj->do_pass was surplus to requirements, ->uncacheable is plenty.

parent 1adbf27d
...@@ -259,9 +259,9 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo) ...@@ -259,9 +259,9 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo)
HTTP_Setup(bo->bereq0, bo->ws, bo->vsl, SLT_BereqMethod); HTTP_Setup(bo->bereq0, bo->ws, bo->vsl, SLT_BereqMethod);
http_FilterReq(bo->bereq0, bo->req->http, http_FilterReq(bo->bereq0, bo->req->http,
bo->do_pass ? HTTPH_R_PASS : HTTPH_R_FETCH); bo->uncacheable ? HTTPH_R_PASS : HTTPH_R_FETCH);
if (bo->do_pass) if (bo->uncacheable)
AZ(bo->stale_oc); AZ(bo->stale_oc);
else { else {
http_ForceField(bo->bereq0, HTTP_HDR_METHOD, "GET"); http_ForceField(bo->bereq0, HTTP_HDR_METHOD, "GET");
...@@ -366,7 +366,7 @@ vbf_304_logic(struct busyobj *bo) ...@@ -366,7 +366,7 @@ vbf_304_logic(struct busyobj *bo)
HTTP_Merge(bo->wrk, bo->stale_oc, bo->beresp); HTTP_Merge(bo->wrk, bo->stale_oc, bo->beresp);
assert(http_IsStatus(bo->beresp, 200)); assert(http_IsStatus(bo->beresp, 200));
bo->was_304 = 1; bo->was_304 = 1;
} else if (!bo->do_pass) { } else if (!bo->uncacheable) {
/* /*
* Backend sent unallowed 304 * Backend sent unallowed 304
*/ */
...@@ -397,7 +397,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo) ...@@ -397,7 +397,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC); CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
AZ(bo->storage); AZ(bo->storage);
bo->storage = bo->do_pass ? stv_transient : STV_next(); bo->storage = bo->uncacheable ? stv_transient : STV_next();
if (bo->retries > 0) if (bo->retries > 0)
http_Unset(bo->bereq, "\012X-Varnish:"); http_Unset(bo->bereq, "\012X-Varnish:");
...@@ -406,7 +406,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo) ...@@ -406,7 +406,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
VCL_backend_fetch_method(bo->vcl, wrk, NULL, bo, NULL); VCL_backend_fetch_method(bo->vcl, wrk, NULL, bo, NULL);
bo->uncacheable = bo->do_pass;
if (wrk->handling == VCL_RET_ABANDON || wrk->handling == VCL_RET_FAIL) if (wrk->handling == VCL_RET_ABANDON || wrk->handling == VCL_RET_FAIL)
return (F_STP_FAIL); return (F_STP_FAIL);
...@@ -538,7 +537,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo) ...@@ -538,7 +537,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
bo->uncacheable = 1; bo->uncacheable = 1;
wrk->handling = VCL_RET_DELIVER; wrk->handling = VCL_RET_DELIVER;
} }
if (bo->do_pass || bo->uncacheable) if (bo->uncacheable)
oc->flags |= OC_F_HFM; oc->flags |= OC_F_HFM;
assert(wrk->handling == VCL_RET_DELIVER); assert(wrk->handling == VCL_RET_DELIVER);
...@@ -1114,7 +1113,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc, ...@@ -1114,7 +1113,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
switch (mode) { switch (mode) {
case VBF_PASS: case VBF_PASS:
how = "pass"; how = "pass";
bo->do_pass = 1; bo->uncacheable = 1;
break; break;
case VBF_NORMAL: case VBF_NORMAL:
how = "fetch"; how = "fetch";
......
...@@ -201,6 +201,8 @@ Resp_Setup_Synth(struct req *req) ...@@ -201,6 +201,8 @@ Resp_Setup_Synth(struct req *req)
http_SetHeader(h, "Connection: close"); http_SetHeader(h, "Connection: close");
} }
#include <stdio.h>
static enum req_fsm_nxt v_matchproto_(req_state_f) static enum req_fsm_nxt v_matchproto_(req_state_f)
cnt_deliver(struct worker *wrk, struct req *req) cnt_deliver(struct worker *wrk, struct req *req)
{ {
......
...@@ -262,7 +262,7 @@ VRT_r_bereq_uncacheable(VRT_CTX) ...@@ -262,7 +262,7 @@ VRT_r_bereq_uncacheable(VRT_CTX)
{ {
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC); CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
return (ctx->bo->do_pass); return (ctx->bo->uncacheable);
} }
VCL_VOID VCL_VOID
......
...@@ -39,7 +39,6 @@ BO_FLAG(do_esi, 0, 1, 1, 1, "") ...@@ -39,7 +39,6 @@ BO_FLAG(do_esi, 0, 1, 1, 1, "")
BO_FLAG(do_gzip, 0, 1, 1, 1, "") BO_FLAG(do_gzip, 0, 1, 1, 1, "")
BO_FLAG(do_gunzip, 0, 1, 1, 1, "") BO_FLAG(do_gunzip, 0, 1, 1, 1, "")
BO_FLAG(do_stream, 0, 1, 1, 0, "") BO_FLAG(do_stream, 0, 1, 1, 0, "")
BO_FLAG(do_pass, 0, 0, 0, 0, "")
BO_FLAG(uncacheable, 0, 0, 0, 0, "") BO_FLAG(uncacheable, 0, 0, 0, 0, "")
BO_FLAG(was_304, 0, 1, 0, 0, "") BO_FLAG(was_304, 0, 1, 0, 0, "")
BO_FLAG(is_bgfetch, 1, 0, 0, 0, "") BO_FLAG(is_bgfetch, 1, 0, 0, 0, "")
......
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