Skip to content

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

Even harder asserts for kristians test

parent 27e11399
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
bin/varnishd/cache_center.c
View file @ 555735f0
...@@ -164,6 +164,9 @@ cnt_prepresp(struct sess *sp) ...@@ -164,6 +164,9 @@ cnt_prepresp(struct sess *sp)
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC); CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
if (sp->wrk->do_stream)
AssertObjCorePassOrBusy(sp->obj->objcore);
sp->wrk->res_mode = 0; sp->wrk->res_mode = 0;
if ((sp->wrk->h_content_length != NULL || !sp->wrk->do_stream) && if ((sp->wrk->h_content_length != NULL || !sp->wrk->do_stream) &&
...@@ -242,10 +245,12 @@ cnt_prepresp(struct sess *sp) ...@@ -242,10 +245,12 @@ cnt_prepresp(struct sess *sp)
default: default:
WRONG("Illegal action in vcl_deliver{}"); WRONG("Illegal action in vcl_deliver{}");
} }
if (sp->wrk->do_stream) if (sp->wrk->do_stream) {
AssertObjCorePassOrBusy(sp->obj->objcore);
sp->step = STP_STREAMBODY; sp->step = STP_STREAMBODY;
else } else {
sp->step = STP_DELIVER; sp->step = STP_DELIVER;
}
return (0); return (0);
} }
...@@ -817,8 +822,9 @@ cnt_fetchbody(struct sess *sp) ...@@ -817,8 +822,9 @@ cnt_fetchbody(struct sess *sp)
RFC2616_Do_Cond(sp)) RFC2616_Do_Cond(sp))
sp->wrk->do_stream = 0; sp->wrk->do_stream = 0;
AssertObjCorePassOrBusy(sp->obj->objcore);
if (sp->wrk->do_stream) { if (sp->wrk->do_stream) {
AssertObjCorePassOrBusy(sp->obj->objcore);
sp->step = STP_PREPRESP; sp->step = STP_PREPRESP;
return (0); return (0);
} }
...@@ -886,6 +892,8 @@ cnt_streambody(struct sess *sp) ...@@ -886,6 +892,8 @@ cnt_streambody(struct sess *sp)
RES_StreamStart(sp); RES_StreamStart(sp);
AssertObjCorePassOrBusy(sp->obj->objcore);
i = FetchBody(sp); i = FetchBody(sp);
sp->wrk->h_content_length = NULL; sp->wrk->h_content_length = NULL;
......
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