[master] d969d62 We cannot elope to vcl_error if things go bad with a streaming fetch, we simply have to abandon it.

Poul-Henning Kamp phk at varnish-cache.org
Mon May 2 16:09:05 CEST 2011


commit d969d627c940727dda0c1bcecccb9d0193d42d13
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 2 14:06:19 2011 +0000

    We cannot elope to vcl_error if things go bad with a streaming fetch,
    we simply have to abandon it.

diff --git a/bin/varnishd/cache_center.c b/bin/varnishd/cache_center.c
index 4b408ae..0447dc7 100644
--- a/bin/varnishd/cache_center.c
+++ b/bin/varnishd/cache_center.c
@@ -867,16 +867,7 @@ cnt_streambody(struct sess *sp)
 	AZ(sp->vbc);
 	AN(sp->director);
 
-	if (i) {
-		sp->wrk->sctx = NULL;
-		HSH_Drop(sp);
-		AZ(sp->obj);
-		sp->err_code = 503;
-		sp->step = STP_ERROR;
-		return (0);
-	}
-
-	if (sp->obj->objcore != NULL) {
+	if (!i && sp->obj->objcore != NULL) {
 		EXP_Insert(sp->obj);
 		AN(sp->obj->objcore);
 		AN(sp->obj->objcore->ban);



More information about the varnish-commit mailing list