[master] 10e1416 Remove req argument from vcl_backend_fetch{}

[Poul-Henning Kamp]

commit 10e141669a755387682f0b9a7d133f6ad1f3f1f3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri May 3 07:44:42 2013 +0000

    Remove req argument from vcl_backend_fetch{}

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 9eef389..df19c30 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -924,7 +924,7 @@ cnt_miss(struct worker *wrk, struct req *req)
 		http_SetHeader(bo->bereq, "Accept-Encoding: gzip");
 	}
 
-	VCL_backend_fetch_method(bo->vcl, wrk, req, bo, bo->bereq->ws);
+	VCL_backend_fetch_method(bo->vcl, wrk, NULL, bo, bo->bereq->ws);
 	VCL_miss_method(req->vcl, wrk, req, NULL, req->http->ws);
 
 	if (wrk->handling == VCL_RET_FETCH) {
@@ -989,7 +989,7 @@ cnt_pass(struct worker *wrk, struct req *req)
 	HTTP_Setup(bo->bereq, bo->ws, bo->vsl, HTTP_Bereq);
 	http_FilterReq(req, HTTPH_R_PASS);
 
-	VCL_backend_fetch_method(bo->vcl, wrk, req, bo, bo->bereq->ws);
+	VCL_backend_fetch_method(bo->vcl, wrk, NULL, bo, bo->bereq->ws);
 	VCL_pass_method(bo->vcl, wrk, req, bo, bo->bereq->ws);
 
 	if (wrk->handling == VCL_RET_ERROR) {
diff --git a/bin/varnishtest/tests/r00781.vtc b/bin/varnishtest/tests/r00781.vtc
index d58bf29..120c363 100644
--- a/bin/varnishtest/tests/r00781.vtc
+++ b/bin/varnishtest/tests/r00781.vtc
@@ -10,7 +10,7 @@ varnish v1 -vcl+backend {
 		set req.url = req.http.foo;
 	}
 	sub vcl_backend_fetch {
-		set bereq.url = req.http.foo;
+		set bereq.url = bereq.http.foo;
 	}
 } -start