[master] 8362ad3 Revert some hacks which snug into previous commit.

[Poul-Henning Kamp]

commit 8362ad31d8c56b8f3703f33eb89afa67b4a3669f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 15 11:42:03 2016 +0000

    Revert some hacks which snug into previous commit.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index dba9da3..fa9d8f6 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -688,9 +688,6 @@ cnt_recv(struct worker *wrk, struct req *req)
 	}
 
 	VCL_recv_method(req->vcl, wrk, req, NULL, NULL);
-	if (wrk->handling == VCL_RET_VCL)
-		VCL_recv_method(req->vcl, wrk, req, NULL, NULL);
-	assert (wrk->handling != VCL_RET_VCL);
 
 	/* Attempts to cache req.body may fail */
 	if (req->req_body_status == REQ_BODY_FAIL) {
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index d3096c4..fdbaa00 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -105,8 +105,6 @@ run_vcc(void *priv)
 	VCC_Unsafe_Path(vcc, mgt_vcc_unsafe_path);
 	VTAILQ_FOREACH(stv, &stv_stevedores, list)
 		VCC_Stevedore(vcc, stv->ident);
-VCC_Vcl(vcc, "vclA");
-VCC_Vcl(vcc, "vclB");
 	VCC_Stevedore(vcc, stv_transient->ident);
 	csrc = VCC_Compile(vcc, &sb, vp->vclsrc, vp->vclsrcfile);
 	AZ(VSB_finish(sb));