Skip to content

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

For esi-child + gzip, wait for BOS_Finished rather than for busyobj 

pointer to disappear.
parent 9cc77a45
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
bin/varnishd/http1/cache_http1_deliver.c
View file @ f766f17f
...@@ -338,10 +338,8 @@ V1D_Deliver(struct req *req, struct busyobj *bo) ...@@ -338,10 +338,8 @@ V1D_Deliver(struct req *req, struct busyobj *bo)
ESI_Deliver(req); ESI_Deliver(req);
} else if (req->res_mode & RES_ESI_CHILD && req->gzip_resp) { } else if (req->res_mode & RES_ESI_CHILD && req->gzip_resp) {
l = -1; l = -1;
while (req->objcore->busyobj) { if (bo != NULL)
assert(bo != NULL); VBO_waitstate(bo, BOS_FINISHED);
l = VBO_waitlen(req->wrk, bo, l);
}
ESI_DeliverChild(req); ESI_DeliverChild(req);
} else if (req->res_mode & RES_GUNZIP || } else if (req->res_mode & RES_GUNZIP ||
(req->res_mode & RES_ESI_CHILD && (req->res_mode & RES_ESI_CHILD &&
......
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