Commit d8094d26 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Set streaming by default, to flush out problems. (We don't actually

stream yet, we just pretend for some of the way)

Fix a couple of tests to DTRT accordingly.
parent 8a22dbf5
...@@ -134,6 +134,8 @@ VBO_GetBusyObj(struct worker *wrk) ...@@ -134,6 +134,8 @@ VBO_GetBusyObj(struct worker *wrk)
WS_Init(bo->ws, "bo", p, bo->end - p); WS_Init(bo->ws, "bo", p, bo->end - p);
bo->do_stream = 1;
return (bo); return (bo);
} }
......
...@@ -212,23 +212,15 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req) ...@@ -212,23 +212,15 @@ cnt_prepresp(struct sess *sp, struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC); CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC); CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
if (bo != NULL) { if (bo != NULL)
CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC); CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
AN(bo->do_stream);
}
req->res_mode = 0; req->res_mode = 0;
if (bo == NULL) if (bo == NULL)
req->res_mode |= RES_LEN; req->res_mode |= RES_LEN;
if (bo != NULL && if (bo == NULL && !req->disable_esi && req->obj->esidata != NULL) {
(bo->h_content_length != NULL ||
!bo->do_stream) &&
!bo->do_gzip && !bo->do_gunzip)
req->res_mode |= RES_LEN;
if (!req->disable_esi && req->obj->esidata != NULL) {
/* In ESI mode, we don't know the aggregate length */ /* In ESI mode, we don't know the aggregate length */
req->res_mode &= ~RES_LEN; req->res_mode &= ~RES_LEN;
req->res_mode |= RES_ESI; req->res_mode |= RES_ESI;
...@@ -883,7 +875,8 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req) ...@@ -883,7 +875,8 @@ cnt_fetchbody(struct sess *sp, struct worker *wrk, struct req *req)
HSH_Unbusy(&wrk->stats, req->obj->objcore); HSH_Unbusy(&wrk->stats, req->obj->objcore);
} }
if (Pool_Task(wrk->pool, &bo->fetch_task, POOL_NO_QUEUE)) if (!bo->do_stream ||
Pool_Task(wrk->pool, &bo->fetch_task, POOL_NO_QUEUE))
FetchBody(wrk, bo); FetchBody(wrk, bo);
while (bo->state < BOS_FAILED) while (bo->state < BOS_FAILED)
......
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