Skip to content

V
varnish-cache
Commit 5691cc0d authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Don't borrow the parent VCL in esi-includes, vcl switching 

would give subsequent esi-includes the wrong vcl.
parent d46391fa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
bin/varnishd/cache/cache_esi_deliver.c
View file @ 5691cc0d
...@@ -163,7 +163,7 @@ ved_include(struct req *preq, const char *src, const char *host, ...@@ -163,7 +163,7 @@ ved_include(struct req *preq, const char *src, const char *host,
AZ(req->vcl); AZ(req->vcl);
req->vcl = preq->vcl; req->vcl = preq->vcl;
preq->vcl = NULL; VCL_Ref(req->vcl);
req->req_step = R_STP_RECV; req->req_step = R_STP_RECV;
req->t_req = preq->t_req; req->t_req = preq->t_req;
...@@ -197,9 +197,7 @@ ved_include(struct req *preq, const char *src, const char *host, ...@@ -197,9 +197,7 @@ ved_include(struct req *preq, const char *src, const char *host,
AZ(req->wrk); AZ(req->wrk);
} }
AZ(preq->vcl); VCL_Rel(&req->vcl);
preq->vcl = req->vcl;
req->vcl = NULL;
req->wrk = NULL; req->wrk = NULL;
THR_SetRequest(preq); THR_SetRequest(preq);
......
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