[master] 4614058 Forgotten file in last commit:

[Poul-Henning Kamp]

commit 4614058b12987fe726bc713fcd8e475e169c5c2c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 13 09:09:02 2013 +0000

    Forgotten file in last commit:
    
    Change args to http_FilterReq() to lower level.

diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index e9f9e22..82d9ecf 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -585,21 +585,18 @@ http_filterfields(struct http *to, const struct http *fm, unsigned how)
 /*--------------------------------------------------------------------*/
 
 void
-http_FilterReq(const struct req *req, unsigned how)
+http_FilterReq(struct http *to, const struct http *fm, unsigned how)
 {
-	struct http *hp;
-
-	hp = req->busyobj->bereq;
-	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
+	CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
+	CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
 
-	http_linkh(hp, req->http, HTTP_HDR_METHOD);
-	http_linkh(hp, req->http, HTTP_HDR_URL);
+	http_linkh(to, fm, HTTP_HDR_METHOD);
+	http_linkh(to, fm, HTTP_HDR_URL);
 	if (how == HTTPH_R_FETCH)
-		http_SetH(hp, HTTP_HDR_PROTO, "HTTP/1.1");
+		http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
 	else
-		http_linkh(hp, req->http, HTTP_HDR_PROTO);
-	http_filterfields(hp, req->http, how);
-	http_PrintfHeader(hp, "X-Varnish: %u", req->vsl->wid & VSL_IDENTMASK);
+		http_linkh(to, fm, HTTP_HDR_PROTO);
+	http_filterfields(to, fm, how);
 }
 
 /*--------------------------------------------------------------------*/