[master] 0e8db99 Eliminate error and restart as possible returns from vcl_backend_response{}

Poul-Henning Kamp phk at varnish-cache.org
Mon May 6 13:17:40 CEST 2013


commit 0e8db99b6f3070be9a605846a6dbb4ac01425630
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 6 11:16:54 2013 +0000

    Eliminate error and restart as possible returns from vcl_backend_response{}
    
    We may want a better way to return synthetic objects from
    vcl_backend_reponse{}, it looks a bit clumsy in the vtc's so far.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index b68f2ea..77a4688 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -417,7 +417,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
 		AZ(bo->do_esi);
 		AZ(bo->do_pass);
 
-		VCL_backend_response_method(bo->vcl, wrk, req, bo,
+		VCL_backend_response_method(bo->vcl, wrk, NULL, bo,
 		    bo->beresp->ws);
 
 		if (bo->do_pass)
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index 88b96fc..3dc15e2 100755
--- a/lib/libvcl/generate.py
+++ b/lib/libvcl/generate.py
@@ -85,7 +85,7 @@ returns =(
 	('miss',		"C", ('error', 'restart', 'pass', 'fetch',)),
 	('lookup',		"C", ('error', 'restart', 'pass', 'deliver',)),
 	('backend_fetch',	"B", ('error', 'fetch', 'pass',)),
-	('backend_response',	"B", ('error', 'restart', 'deliver',)),
+	('backend_response',	"B", ('deliver',)),
 	('deliver',		"C", ('restart', 'deliver',)),
 	('error',		"C", ('restart', 'deliver',)),
 	('init',		"", ('ok',)),



More information about the varnish-commit mailing list