[master] 5ddc4a3 Restructure slightly to fit v4 realities.

[Poul-Henning Kamp]

commit 5ddc4a3aa2ce508954ae16c248eccbc869697fdf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat May 4 12:37:00 2013 +0000

    Restructure slightly to fit v4 realities.

diff --git a/bin/varnishtest/tests/r00412.vtc b/bin/varnishtest/tests/r00412.vtc
index 0e49607..4cb988b 100644
--- a/bin/varnishtest/tests/r00412.vtc
+++ b/bin/varnishtest/tests/r00412.vtc
@@ -15,13 +15,12 @@ varnish v1 -vcl+backend {
 		if (beresp.status == 303) {
 			set beresp.ttl = 60 s;
 			set beresp.http.X-Magic-Redirect = "1";
-			set req.url = beresp.http.Location;
-			return (restart);
+			return (deliver);
 		}
 	}
-	sub vcl_lookup {
-		if (obj.http.X-Magic-Redirect == "1") {
-			set req.url = obj.http.Location;
+	sub vcl_deliver {
+		if (resp.http.X-Magic-Redirect == "1") {
+			set req.url = resp.http.Location;
 			return (restart);
 		}
 	}