[master] 3592eed Aim the axe at vcl_pass{}

Poul-Henning Kamp phk at varnish-cache.org
Tue May 7 08:50:43 CEST 2013


commit 3592eeda903c0769ccab6fb2f4a729ad44827388
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 7 06:50:28 2013 +0000

    Aim the axe at vcl_pass{}

diff --git a/bin/varnishtest/tests/b00035.vtc b/bin/varnishtest/tests/b00035.vtc
index 9d49f4f..dbe8a6f 100644
--- a/bin/varnishtest/tests/b00035.vtc
+++ b/bin/varnishtest/tests/b00035.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
 		return (pass);
 	}
 
-	sub vcl_pass {
+	sub vcl_backend_fetch {
 		set bereq.method = bereq.request + "C";
 		set bereq.request = bereq.method + "D";
 	}
diff --git a/bin/varnishtest/tests/r00965.vtc b/bin/varnishtest/tests/r00965.vtc
index f8228a9..865e16a 100644
--- a/bin/varnishtest/tests/r00965.vtc
+++ b/bin/varnishtest/tests/r00965.vtc
@@ -7,8 +7,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
-		if (req.http.X-Banned == "check") { remove req.http.X-Banned; }
-		elseif (req.restarts == 0) {
+		if (req.http.X-Banned == "check") {
+			remove req.http.X-Banned;
+		} elseif (req.restarts == 0) {
 		        set req.http.X-Banned = "check";
 			if (req.http.x-pass) {
 				return (pass);
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 2553638..a89ecb6 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl {
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 	sub vcl_miss { error 100 req.url ; }
-	sub vcl_pass { error 100 "the butter please" ; }
+	sub vcl_lookup { error 100 "the butter please" ; }
 	sub vcl_backend_response { error beresp.status req.url; }
 }
 



More information about the varnish-commit mailing list