[master] 084fe15 Rename vcl_fetch{} to vcl_response{}

Poul-Henning Kamp phk at varnish-cache.org
Wed Mar 20 13:08:50 CET 2013


commit 084fe159017f38b5b132dbb68f3bc60ab1557935
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 20 12:08:36 2013 +0000

    Rename vcl_fetch{} to vcl_response{}

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index e1fd343..2c65976 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -416,7 +416,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
 		AZ(bo->do_esi);
 		AZ(bo->do_pass);
 
-		VCL_fetch_method(req);
+		VCL_response_method(req);
 
 		if (bo->do_pass)
 			req->objcore->flags |= OC_F_PASS;
diff --git a/bin/varnishd/default.vcl b/bin/varnishd/default.vcl
index 0e2031a..8b90194 100644
--- a/bin/varnishd/default.vcl
+++ b/bin/varnishd/default.vcl
@@ -101,7 +101,7 @@ sub vcl_miss {
     return (fetch);
 }
 
-sub vcl_fetch {
+sub vcl_response {
     if (beresp.ttl <= 0s ||
         beresp.http.Set-Cookie ||
         beresp.http.Surrogate-control ~ "no-store" ||
diff --git a/bin/varnishtest/tests.disabled/r00929.vtc b/bin/varnishtest/tests.disabled/r00929.vtc
index 3b2f7ca..996465a 100644
--- a/bin/varnishtest/tests.disabled/r00929.vtc
+++ b/bin/varnishtest/tests.disabled/r00929.vtc
@@ -8,7 +8,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = true;
 	}
 
diff --git a/bin/varnishtest/tests.disabled/r00978.vtc b/bin/varnishtest/tests.disabled/r00978.vtc
index 39b89cb..e14402d 100644
--- a/bin/varnishtest/tests.disabled/r00978.vtc
+++ b/bin/varnishtest/tests.disabled/r00978.vtc
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 			set req.url = req.url + req.esi_level;
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests.disabled/r00979.vtc b/bin/varnishtest/tests.disabled/r00979.vtc
index bc72efc..0857981 100644
--- a/bin/varnishtest/tests.disabled/r00979.vtc
+++ b/bin/varnishtest/tests.disabled/r00979.vtc
@@ -11,7 +11,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = true;
 	}
 	sub vcl_deliver {
diff --git a/bin/varnishtest/tests.disabled/r00980.vtc b/bin/varnishtest/tests.disabled/r00980.vtc
index b7d307e..da4d83c 100644
--- a/bin/varnishtest/tests.disabled/r00980.vtc
+++ b/bin/varnishtest/tests.disabled/r00980.vtc
@@ -9,7 +9,7 @@ server s1 {
 
 varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_gzip = true;
 		set beresp.do_stream = true;
 	}
diff --git a/bin/varnishtest/tests.disabled/t00000.vtc b/bin/varnishtest/tests.disabled/t00000.vtc
index 8265195..b4fcc5b 100644
--- a/bin/varnishtest/tests.disabled/t00000.vtc
+++ b/bin/varnishtest/tests.disabled/t00000.vtc
@@ -15,7 +15,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests.disabled/t00001.vtc b/bin/varnishtest/tests.disabled/t00001.vtc
index 2237466..84aa647 100644
--- a/bin/varnishtest/tests.disabled/t00001.vtc
+++ b/bin/varnishtest/tests.disabled/t00001.vtc
@@ -22,7 +22,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/foo") {
 			set beresp.do_gzip = true;
 		}
diff --git a/bin/varnishtest/tests/b00015.vtc b/bin/varnishtest/tests/b00015.vtc
index fc022c3..7cb1b97 100644
--- a/bin/varnishtest/tests/b00015.vtc
+++ b/bin/varnishtest/tests/b00015.vtc
@@ -53,7 +53,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status == 502) {
 			set beresp.ttl = 10m;
 		}
diff --git a/bin/varnishtest/tests/b00018.vtc b/bin/varnishtest/tests/b00018.vtc
index bbd7c0e..6197511 100644
--- a/bin/varnishtest/tests/b00018.vtc
+++ b/bin/varnishtest/tests/b00018.vtc
@@ -1,4 +1,4 @@
-varnishtest "Check that error in vcl_fetch works"
+varnishtest "Check that error in vcl_response works"
 
 server s1 {
 	rxreq 
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 	    set beresp.http.Foo = "bar";
 	    error 523 "not ok";
 	}
diff --git a/bin/varnishtest/tests/b00019.vtc b/bin/varnishtest/tests/b00019.vtc
index 2572a57..542e32d 100644
--- a/bin/varnishtest/tests/b00019.vtc
+++ b/bin/varnishtest/tests/b00019.vtc
@@ -21,7 +21,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 	       return (restart);
 	}
 
diff --git a/bin/varnishtest/tests/b00020.vtc b/bin/varnishtest/tests/b00020.vtc
index 365c305..a6baaed 100644
--- a/bin/varnishtest/tests/b00020.vtc
+++ b/bin/varnishtest/tests/b00020.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00021.vtc b/bin/varnishtest/tests/b00021.vtc
index 5c3261a..eedcca2 100644
--- a/bin/varnishtest/tests/b00021.vtc
+++ b/bin/varnishtest/tests/b00021.vtc
@@ -13,7 +13,7 @@ varnish v1 -vcl+backend {
 	sub vcl_miss {
 		set bereq.between_bytes_timeout = 2s;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00022.vtc b/bin/varnishtest/tests/b00022.vtc
index 722d9f1..9f4dd1e 100644
--- a/bin/varnishtest/tests/b00022.vtc
+++ b/bin/varnishtest/tests/b00022.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl {
 		.port = "${s1_port}";
 		.between_bytes_timeout = 1s;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00027.vtc b/bin/varnishtest/tests/b00027.vtc
index 9cc7a7a..941dc9c 100644
--- a/bin/varnishtest/tests/b00027.vtc
+++ b/bin/varnishtest/tests/b00027.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00028.vtc b/bin/varnishtest/tests/b00028.vtc
index 20e30aa..6316fde 100644
--- a/bin/varnishtest/tests/b00028.vtc
+++ b/bin/varnishtest/tests/b00028.vtc
@@ -7,7 +7,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.foo ~ "bar") {
 			set beresp.http.foo1 = "1";
 		} else {
diff --git a/bin/varnishtest/tests/c00001.vtc b/bin/varnishtest/tests/c00001.vtc
index f1a6824..bfc9d08 100644
--- a/bin/varnishtest/tests/c00001.vtc
+++ b/bin/varnishtest/tests/c00001.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.Snafu1 = regsub(beresp.http.Foobar, "ar", "\0\0");
 		set beresp.http.Snafu2 =
 		    regsub(beresp.http.Foobar, "(b)(a)(r)(f)", "\4\3\2p");
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index d0c4b71..9d5f1a0 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status != 200) {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index 952966b..3145575 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_pass = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index 7e5dab1..aefd1ce 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_pass = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00027.vtc b/bin/varnishtest/tests/c00027.vtc
index 62d0716..9e842de 100644
--- a/bin/varnishtest/tests/c00027.vtc
+++ b/bin/varnishtest/tests/c00027.vtc
@@ -19,7 +19,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-s malloc,1M" -vcl+backend {
-	sub vcl_fetch { 
+	sub vcl_response { 
 		set beresp.ttl = 10m; 
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00029.vtc b/bin/varnishtest/tests/c00029.vtc
index 7396a2b..2eb685b 100644
--- a/bin/varnishtest/tests/c00029.vtc
+++ b/bin/varnishtest/tests/c00029.vtc
@@ -37,7 +37,7 @@ varnish v1 -arg "-p saintmode_threshold=2" -vcl+backend {
 		set req.grace = 1h;
 	}
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
 			return(restart);
diff --git a/bin/varnishtest/tests/c00030.vtc b/bin/varnishtest/tests/c00030.vtc
index adb39ee..8941a45 100644
--- a/bin/varnishtest/tests/c00030.vtc
+++ b/bin/varnishtest/tests/c00030.vtc
@@ -44,7 +44,7 @@ varnish v1 -arg "-p saintmode_threshold=10" -vcl {
 		set req.grace = 1h;
 	}
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
 			return (restart);
diff --git a/bin/varnishtest/tests/c00032.vtc b/bin/varnishtest/tests/c00032.vtc
index 621758f..eb7e57c 100644
--- a/bin/varnishtest/tests/c00032.vtc
+++ b/bin/varnishtest/tests/c00032.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status == 400) {
 			rollback;
 			set req.url = "/bar";
diff --git a/bin/varnishtest/tests/c00044.vtc b/bin/varnishtest/tests/c00044.vtc
index f72d2e1..ad6d3c6 100644
--- a/bin/varnishtest/tests/c00044.vtc
+++ b/bin/varnishtest/tests/c00044.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "invalid";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00045.vtc b/bin/varnishtest/tests/c00045.vtc
index 683c443..a480fe1 100644
--- a/bin/varnishtest/tests/c00045.vtc
+++ b/bin/varnishtest/tests/c00045.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "s0";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00046.vtc b/bin/varnishtest/tests/c00046.vtc
index 0719df3..17fb33b 100644
--- a/bin/varnishtest/tests/c00046.vtc
+++ b/bin/varnishtest/tests/c00046.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "s0";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00047.vtc b/bin/varnishtest/tests/c00047.vtc
index 4b23194..d9e4ee2 100644
--- a/bin/varnishtest/tests/c00047.vtc
+++ b/bin/varnishtest/tests/c00047.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.baz1 = regsuball(beresp.http.foo, "barb", "zz");
 		set beresp.http.baz2 = regsuball(beresp.http.foo, "ar", "zz");
 		set beresp.http.baz3 = regsuball(beresp.http.foo, "^", "baz");
diff --git a/bin/varnishtest/tests/c00055.vtc b/bin/varnishtest/tests/c00055.vtc
index fb9a575..15590d3 100644
--- a/bin/varnishtest/tests/c00055.vtc
+++ b/bin/varnishtest/tests/c00055.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend {
 		C{ VRT_CacheReqBody(req, 1000); }C
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.foo == "BAR") {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index 1cc41fc..2de8f23 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00001.vtc b/bin/varnishtest/tests/e00001.vtc
index 9b6d1de..13312d3 100644
--- a/bin/varnishtest/tests/e00001.vtc
+++ b/bin/varnishtest/tests/e00001.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start -cliok "param.set esi_syntax 4"
diff --git a/bin/varnishtest/tests/e00002.vtc b/bin/varnishtest/tests/e00002.vtc
index 3f755d1..8aa223f 100644
--- a/bin/varnishtest/tests/e00002.vtc
+++ b/bin/varnishtest/tests/e00002.vtc
@@ -13,7 +13,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index 805219f..6a8ea92 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 			set req.url = req.url + req.esi_level;
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00004.vtc b/bin/varnishtest/tests/e00004.vtc
index 1643e14..9a95dac 100644
--- a/bin/varnishtest/tests/e00004.vtc
+++ b/bin/varnishtest/tests/e00004.vtc
@@ -17,7 +17,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00005.vtc b/bin/varnishtest/tests/e00005.vtc
index a47837d..7f5c333 100644
--- a/bin/varnishtest/tests/e00005.vtc
+++ b/bin/varnishtest/tests/e00005.vtc
@@ -18,7 +18,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index 804ee5a..3b9c6db 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -29,7 +29,7 @@ varnish v1 -vcl+backend {
 			set req.backend = s1;
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00007.vtc b/bin/varnishtest/tests/e00007.vtc
index 2418f81..225ec3c 100644
--- a/bin/varnishtest/tests/e00007.vtc
+++ b/bin/varnishtest/tests/e00007.vtc
@@ -32,7 +32,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,2m" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 15b915a..4af581f 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -56,7 +56,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index f3754ff..099d1b9 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -18,7 +18,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00010.vtc b/bin/varnishtest/tests/e00010.vtc
index 2cc0d78..1a0b33d 100644
--- a/bin/varnishtest/tests/e00010.vtc
+++ b/bin/varnishtest/tests/e00010.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start -cli "param.set esi_syntax 2"
diff --git a/bin/varnishtest/tests/e00011.vtc b/bin/varnishtest/tests/e00011.vtc
index 062b13a..8d129b8 100644
--- a/bin/varnishtest/tests/e00011.vtc
+++ b/bin/varnishtest/tests/e00011.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_pass = true;
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/e00012.vtc b/bin/varnishtest/tests/e00012.vtc
index 97672f1..60cc4d1 100644
--- a/bin/varnishtest/tests/e00012.vtc
+++ b/bin/varnishtest/tests/e00012.vtc
@@ -17,7 +17,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_fetch {
+        sub vcl_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00013.vtc b/bin/varnishtest/tests/e00013.vtc
index 700914c..b659e53 100644
--- a/bin/varnishtest/tests/e00013.vtc
+++ b/bin/varnishtest/tests/e00013.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_fetch {
+        sub vcl_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00014.vtc b/bin/varnishtest/tests/e00014.vtc
index e366f1f..d174650 100644
--- a/bin/varnishtest/tests/e00014.vtc
+++ b/bin/varnishtest/tests/e00014.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_fetch {
+        sub vcl_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index d658d61..5acf6bc 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -23,7 +23,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 	    	if(req.url == "/") {
  	    	   set req.esi = false;
 		}
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index f9a3901..718c690 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -27,7 +27,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
  	    	set req.esi = true;	
 	    	if(req.url == "/body") {
 		   set req.esi = false;
diff --git a/bin/varnishtest/tests/e00017.vtc b/bin/varnishtest/tests/e00017.vtc
index ac32d5f..0eedd1d 100644
--- a/bin/varnishtest/tests/e00017.vtc
+++ b/bin/varnishtest/tests/e00017.vtc
@@ -71,7 +71,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00018.vtc b/bin/varnishtest/tests/e00018.vtc
index 305ff0f..6b709db 100644
--- a/bin/varnishtest/tests/e00018.vtc
+++ b/bin/varnishtest/tests/e00018.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 54c756f..a45ed76 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -29,7 +29,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "bar") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index f9b73a4..5a20356 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_gunzip = true;
 	}
diff --git a/bin/varnishtest/tests/e00021.vtc b/bin/varnishtest/tests/e00021.vtc
index 03fb530..02bd4e8 100644
--- a/bin/varnishtest/tests/e00021.vtc
+++ b/bin/varnishtest/tests/e00021.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index b4b3572..fc45ed3 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -18,7 +18,7 @@ varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00023.vtc b/bin/varnishtest/tests/e00023.vtc
index 03d185b..47dec0f 100644
--- a/bin/varnishtest/tests/e00023.vtc
+++ b/bin/varnishtest/tests/e00023.vtc
@@ -36,7 +36,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00024.vtc b/bin/varnishtest/tests/e00024.vtc
index 87235c5..b99d296 100644
--- a/bin/varnishtest/tests/e00024.vtc
+++ b/bin/varnishtest/tests/e00024.vtc
@@ -60,7 +60,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00026.vtc b/bin/varnishtest/tests/e00026.vtc
index fa6cf9a..39c3de0 100644
--- a/bin/varnishtest/tests/e00026.vtc
+++ b/bin/varnishtest/tests/e00026.vtc
@@ -28,7 +28,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url != "/foo") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00027.vtc b/bin/varnishtest/tests/e00027.vtc
index 2ee4339..b977004 100644
--- a/bin/varnishtest/tests/e00027.vtc
+++ b/bin/varnishtest/tests/e00027.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/g00002.vtc b/bin/varnishtest/tests/g00002.vtc
index eb10ba0..1ddd9ec 100644
--- a/bin/varnishtest/tests/g00002.vtc
+++ b/bin/varnishtest/tests/g00002.vtc
@@ -17,7 +17,7 @@ varnish v1 \
 	-cliok "param.set gzip_memlevel 1" \
 	-vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/g00003.vtc b/bin/varnishtest/tests/g00003.vtc
index 05edb5d..0721dc4 100644
--- a/bin/varnishtest/tests/g00003.vtc
+++ b/bin/varnishtest/tests/g00003.vtc
@@ -19,7 +19,7 @@ server s1 {
 
 varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_gunzip = true;
 		if (req.url == "/foobar") {
 			set beresp.do_gzip = true;
diff --git a/bin/varnishtest/tests/g00004.vtc b/bin/varnishtest/tests/g00004.vtc
index 0a23c01..d70e146 100644
--- a/bin/varnishtest/tests/g00004.vtc
+++ b/bin/varnishtest/tests/g00004.vtc
@@ -19,7 +19,7 @@ server s1 -repeat 2 {
 
 varnish v1 \
 	-vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 
 		if (req.url == "/gunzip") {
diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc
index aadbbd0..414bbdb 100644
--- a/bin/varnishtest/tests/m00002.vtc
+++ b/bin/varnishtest/tests/m00002.vtc
@@ -11,7 +11,7 @@ server s1 {
 varnish v1 -vcl+backend {
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.rnd1 = std.random(0,1);
 		set beresp.http.rnd2 = std.random(0,10);
 		set beresp.http.rnd3 = std.random(8,10);
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index 123d8fd..72b7e7f 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 	sub vcl_miss {
 		std.collect(bereq.http.baz);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		std.collect(beresp.http.bar);
 	}
 	sub vcl_deliver {
diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index cb0c4e2..ef2b5a1 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -11,7 +11,7 @@ varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
 	-vcl+backend { 
-		sub vcl_fetch {
+		sub vcl_response {
 			set beresp.ttl = 3s;
 		}
 	} -start 
@@ -37,7 +37,7 @@ server s1 -wait {
 } -start
 
 varnish v1 -vcl+backend {
-		sub vcl_fetch {
+		sub vcl_response {
 			set beresp.ttl = 3s;
 		}
 	} -start
diff --git a/bin/varnishtest/tests/p00008.vtc b/bin/varnishtest/tests/p00008.vtc
index e2ab62f..395f9c6 100644
--- a/bin/varnishtest/tests/p00008.vtc
+++ b/bin/varnishtest/tests/p00008.vtc
@@ -18,7 +18,7 @@ varnish v1 \
 	-arg "-pban_lurker_sleep=0" \
 	-storage "-sper1=persistent,${tmpdir}/_.per1,10m -sper2=persistent,${tmpdir}/_.per2,10m" \
 	-vcl+backend {
-		sub vcl_fetch {
+		sub vcl_response {
 			set beresp.storage = "per1";
 			if (req.url ~ "silo2") {
 				set beresp.storage = "per2";
diff --git a/bin/varnishtest/tests/r00251.vtc b/bin/varnishtest/tests/r00251.vtc
index e93eb00..6794c24 100644
--- a/bin/varnishtest/tests/r00251.vtc
+++ b/bin/varnishtest/tests/r00251.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.Snafu1 =
 		    "zoom" +
 		    regsub(beresp.http.Foomble, "ar", "\0\0") +
diff --git a/bin/varnishtest/tests/r00318.vtc b/bin/varnishtest/tests/r00318.vtc
index 4e66fad..bdcdb2f 100644
--- a/bin/varnishtest/tests/r00318.vtc
+++ b/bin/varnishtest/tests/r00318.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_pass = true;
 	}
diff --git a/bin/varnishtest/tests/r00326.vtc b/bin/varnishtest/tests/r00326.vtc
index 0a7aa04..f37d656 100644
--- a/bin/varnishtest/tests/r00326.vtc
+++ b/bin/varnishtest/tests/r00326.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00345.vtc b/bin/varnishtest/tests/r00345.vtc
index 6ebbc99..6cdfe1d 100644
--- a/bin/varnishtest/tests/r00345.vtc
+++ b/bin/varnishtest/tests/r00345.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p debug=+workspace" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r00386.vtc b/bin/varnishtest/tests/r00386.vtc
index c2fcc53..21d944a 100644
--- a/bin/varnishtest/tests/r00386.vtc
+++ b/bin/varnishtest/tests/r00386.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p debug=+workspace" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r00387.vtc b/bin/varnishtest/tests/r00387.vtc
index d4a32f9..eb6a366 100644
--- a/bin/varnishtest/tests/r00387.vtc
+++ b/bin/varnishtest/tests/r00387.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00411.vtc b/bin/varnishtest/tests/r00411.vtc
index 5677fc3..67479d3 100644
--- a/bin/varnishtest/tests/r00411.vtc
+++ b/bin/varnishtest/tests/r00411.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 			return (restart);
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status == 303) {
 			set beresp.ttl = 3m;
 			set beresp.http.X-Magic-Redirect = "1";
diff --git a/bin/varnishtest/tests/r00412.vtc b/bin/varnishtest/tests/r00412.vtc
index 8e28262..2b0082a 100644
--- a/bin/varnishtest/tests/r00412.vtc
+++ b/bin/varnishtest/tests/r00412.vtc
@@ -11,7 +11,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status == 303) {
 			set beresp.ttl = 60 s;
 			set beresp.http.X-Magic-Redirect = "1";
diff --git a/bin/varnishtest/tests/r00427.vtc b/bin/varnishtest/tests/r00427.vtc
index 963b7fe..3d8c9ce 100644
--- a/bin/varnishtest/tests/r00427.vtc
+++ b/bin/varnishtest/tests/r00427.vtc
@@ -24,7 +24,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00433.vtc b/bin/varnishtest/tests/r00433.vtc
index 1bcefa8..d0e6ba8 100644
--- a/bin/varnishtest/tests/r00433.vtc
+++ b/bin/varnishtest/tests/r00433.vtc
@@ -31,7 +31,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc
index 9d29258..535107d 100644
--- a/bin/varnishtest/tests/r00445.vtc
+++ b/bin/varnishtest/tests/r00445.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00476.vtc b/bin/varnishtest/tests/r00476.vtc
index abf15e6..d9e1c9e 100644
--- a/bin/varnishtest/tests/r00476.vtc
+++ b/bin/varnishtest/tests/r00476.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00494.vtc b/bin/varnishtest/tests/r00494.vtc
index 1a7fec3..23c5695 100644
--- a/bin/varnishtest/tests/r00494.vtc
+++ b/bin/varnishtest/tests/r00494.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.bar = beresp.http.foo;
 		remove beresp.http.foo;
 	}
diff --git a/bin/varnishtest/tests/r00524.vtc b/bin/varnishtest/tests/r00524.vtc
index cd43e97..d52e331 100644
--- a/bin/varnishtest/tests/r00524.vtc
+++ b/bin/varnishtest/tests/r00524.vtc
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		// return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -cliok "param.set timeout_idle 60" -start
diff --git a/bin/varnishtest/tests/r00590.vtc b/bin/varnishtest/tests/r00590.vtc
index d865fe9..74d77bc 100644
--- a/bin/varnishtest/tests/r00590.vtc
+++ b/bin/varnishtest/tests/r00590.vtc
@@ -60,7 +60,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00612.vtc b/bin/varnishtest/tests/r00612.vtc
index defaeca..189b720 100644
--- a/bin/varnishtest/tests/r00612.vtc
+++ b/bin/varnishtest/tests/r00612.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00641.vtc b/bin/varnishtest/tests/r00641.vtc
index da54121..94a15b9 100644
--- a/bin/varnishtest/tests/r00641.vtc
+++ b/bin/varnishtest/tests/r00641.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		// return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -cliok "param.set timeout_idle 60" -start
diff --git a/bin/varnishtest/tests/r00667.vtc b/bin/varnishtest/tests/r00667.vtc
index 1555df1..f428e6a 100644
--- a/bin/varnishtest/tests/r00667.vtc
+++ b/bin/varnishtest/tests/r00667.vtc
@@ -16,7 +16,7 @@ server s1 {
 
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl = 0s;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00702.vtc b/bin/varnishtest/tests/r00702.vtc
index 5075c16..9ac03cf 100644
--- a/bin/varnishtest/tests/r00702.vtc
+++ b/bin/varnishtest/tests/r00702.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00704.vtc b/bin/varnishtest/tests/r00704.vtc
index 806fc82..5d0585c 100644
--- a/bin/varnishtest/tests/r00704.vtc
+++ b/bin/varnishtest/tests/r00704.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00769.vtc b/bin/varnishtest/tests/r00769.vtc
index b464914..1f75ad9 100644
--- a/bin/varnishtest/tests/r00769.vtc
+++ b/bin/varnishtest/tests/r00769.vtc
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
 			error 700;
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.status = 404;
 		set beresp.http.X-status = beresp.status;
 		return (deliver);
diff --git a/bin/varnishtest/tests/r00801.vtc b/bin/varnishtest/tests/r00801.vtc
index 3309f22..d7b293f 100644
--- a/bin/varnishtest/tests/r00801.vtc
+++ b/bin/varnishtest/tests/r00801.vtc
@@ -11,7 +11,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv { return (pass); }
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00861.vtc b/bin/varnishtest/tests/r00861.vtc
index 8a3e8a0..cfdaca0 100644
--- a/bin/varnishtest/tests/r00861.vtc
+++ b/bin/varnishtest/tests/r00861.vtc
@@ -23,7 +23,7 @@ server s1 {
 
 varnish v1 \
 	-vcl+backend {
-		sub vcl_fetch {
+		sub vcl_response {
 			if (req.url == "/1" || req.url == "/2") {
 				set beresp.do_esi = true;
 				set beresp.do_gzip = true;
diff --git a/bin/varnishtest/tests/r00873.vtc b/bin/varnishtest/tests/r00873.vtc
index 56afc19..00e1413 100644
--- a/bin/varnishtest/tests/r00873.vtc
+++ b/bin/varnishtest/tests/r00873.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index d3b9856..23f0cb4 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00913.vtc b/bin/varnishtest/tests/r00913.vtc
index e310360..6d5a54c 100644
--- a/bin/varnishtest/tests/r00913.vtc
+++ b/bin/varnishtest/tests/r00913.vtc
@@ -7,7 +7,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.bar ~ "$") {
 			set beresp.http.foo = regsub(beresp.http.bar, "$", "XXX");
 		}
diff --git a/bin/varnishtest/tests/r00915.vtc b/bin/varnishtest/tests/r00915.vtc
index 266c6b7..1c0c21c 100644
--- a/bin/varnishtest/tests/r00915.vtc
+++ b/bin/varnishtest/tests/r00915.vtc
@@ -12,7 +12,7 @@ varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-vcl+backend { 
 
-	sub vcl_fetch {
+	sub vcl_response {
 		error(751);
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00916.vtc b/bin/varnishtest/tests/r00916.vtc
index 27f3f1a..51339b4 100644
--- a/bin/varnishtest/tests/r00916.vtc
+++ b/bin/varnishtest/tests/r00916.vtc
@@ -9,7 +9,7 @@ varnish v1 -errvcl {Symbol not found: 's-1' (expected type BACKEND)} {
 	backend b { .host = "127.0.0.1"; }
 	sub s1 {
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 	    if (req.backend == s-1){
 		set req.backend = s-1;
 	    }
diff --git a/bin/varnishtest/tests/r00941.vtc b/bin/varnishtest/tests/r00941.vtc
index 1028e2d..f6ee1a6 100644
--- a/bin/varnishtest/tests/r00941.vtc
+++ b/bin/varnishtest/tests/r00941.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl = 1000s;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00942.vtc b/bin/varnishtest/tests/r00942.vtc
index 1506709..ffde262 100644
--- a/bin/varnishtest/tests/r00942.vtc
+++ b/bin/varnishtest/tests/r00942.vtc
@@ -26,7 +26,7 @@ server s1 {
 
 varnish v1 \
 	-vcl+backend {
-		sub vcl_fetch {
+		sub vcl_response {
 			set beresp.do_stream = false;
 		}
 } 
diff --git a/bin/varnishtest/tests/r00956.vtc b/bin/varnishtest/tests/r00956.vtc
index c98996d..a41c25a 100644
--- a/bin/varnishtest/tests/r00956.vtc
+++ b/bin/varnishtest/tests/r00956.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl = 10s;
 		set req.http.foo = beresp.ttl;
 		set req.http.bar = "xxx";
diff --git a/bin/varnishtest/tests/r00961.vtc b/bin/varnishtest/tests/r00961.vtc
index b162379..7f7c4f7 100644
--- a/bin/varnishtest/tests/r00961.vtc
+++ b/bin/varnishtest/tests/r00961.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index 4331cd0..77ea57e 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -14,7 +14,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per1,10m -spersistent,${tmpdir}/_.per2,10m" \
 	-vcl+backend { 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "s0";
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00972.vtc b/bin/varnishtest/tests/r00972.vtc
index ed3a916..f6d071c 100644
--- a/bin/varnishtest/tests/r00972.vtc
+++ b/bin/varnishtest/tests/r00972.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01029.vtc b/bin/varnishtest/tests/r01029.vtc
index 2817bba..8e3064c 100644
--- a/bin/varnishtest/tests/r01029.vtc
+++ b/bin/varnishtest/tests/r01029.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		if (req.url == "/foo") {
 			set beresp.ttl = 0s;
diff --git a/bin/varnishtest/tests/r01030.vtc b/bin/varnishtest/tests/r01030.vtc
index 830e465..db58d32 100644
--- a/bin/varnishtest/tests/r01030.vtc
+++ b/bin/varnishtest/tests/r01030.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 		}
 		return (lookup);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.url = req.url;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01036.vtc b/bin/varnishtest/tests/r01036.vtc
index 1c77919..dfd4402 100644
--- a/bin/varnishtest/tests/r01036.vtc
+++ b/bin/varnishtest/tests/r01036.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-smalloc,1M" -arg "-pgzip_level=0" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_stream = false;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01037.vtc b/bin/varnishtest/tests/r01037.vtc
index acb77d3..46ec9d4 100644
--- a/bin/varnishtest/tests/r01037.vtc
+++ b/bin/varnishtest/tests/r01037.vtc
@@ -15,7 +15,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-smalloc,1M" -arg "-pgzip_level=0" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01038.vtc b/bin/varnishtest/tests/r01038.vtc
index e10152f..d7d438c 100644
--- a/bin/varnishtest/tests/r01038.vtc
+++ b/bin/varnishtest/tests/r01038.vtc
@@ -46,7 +46,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p workspace_backend=8k" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01091.vtc b/bin/varnishtest/tests/r01091.vtc
index ae94ca8..2b1fff3 100644
--- a/bin/varnishtest/tests/r01091.vtc
+++ b/bin/varnishtest/tests/r01091.vtc
@@ -25,7 +25,7 @@ varnish v1 -vcl+backend {
         sub vcl_recv {
                 set req.backend = f1.backend();
         }
-        sub vcl_fetch {
+        sub vcl_response {
                 if(req.restarts < 1) {
                         set beresp.saintmode = 1h;
                         return(restart);
diff --git a/bin/varnishtest/tests/r01092.vtc b/bin/varnishtest/tests/r01092.vtc
index 26b0b9c..4311b73 100644
--- a/bin/varnishtest/tests/r01092.vtc
+++ b/bin/varnishtest/tests/r01092.vtc
@@ -19,7 +19,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start -cliok "param.set esi_syntax 4"
diff --git a/bin/varnishtest/tests/r01109.vtc b/bin/varnishtest/tests/r01109.vtc
index e6b43e8..479786c 100644
--- a/bin/varnishtest/tests/r01109.vtc
+++ b/bin/varnishtest/tests/r01109.vtc
@@ -22,7 +22,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-pfetch_chunksize=4k" -arg "-pgzip_level=0" -arg "-pthread_pool_stack=131072" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url ~ "/test") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r01113.vtc b/bin/varnishtest/tests/r01113.vtc
index abcee83..23ef6e0 100644
--- a/bin/varnishtest/tests/r01113.vtc
+++ b/bin/varnishtest/tests/r01113.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 			return(restart);
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/fetch") {
 			return(restart);
 		}
diff --git a/bin/varnishtest/tests/r01123.vtc b/bin/varnishtest/tests/r01123.vtc
index 37a9254..6881d60 100644
--- a/bin/varnishtest/tests/r01123.vtc
+++ b/bin/varnishtest/tests/r01123.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r01157.vtc b/bin/varnishtest/tests/r01157.vtc
index 9cecd9a..ae30994 100644
--- a/bin/varnishtest/tests/r01157.vtc
+++ b/bin/varnishtest/tests/r01157.vtc
@@ -12,7 +12,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv { return (pass); }
-	sub vcl_fetch {	set beresp.do_stream = true; }
+	sub vcl_response {	set beresp.do_stream = true; }
 } -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/r01168.vtc b/bin/varnishtest/tests/r01168.vtc
index fb0a0c5..52a8827 100644
--- a/bin/varnishtest/tests/r01168.vtc
+++ b/bin/varnishtest/tests/r01168.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		rollback;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01175.vtc b/bin/varnishtest/tests/r01175.vtc
index 67e1354..f5c1c8e 100644
--- a/bin/varnishtest/tests/r01175.vtc
+++ b/bin/varnishtest/tests/r01175.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-s test=malloc,1M" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "test";
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01184.vtc b/bin/varnishtest/tests/r01184.vtc
index 046b371..5c9de55 100644
--- a/bin/varnishtest/tests/r01184.vtc
+++ b/bin/varnishtest/tests/r01184.vtc
@@ -32,7 +32,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 } -start
@@ -64,7 +64,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 	}
 }
@@ -95,7 +95,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_esi = true;
 		set beresp.do_gunzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01206.vtc b/bin/varnishtest/tests/r01206.vtc
index dc403ed..2dc3b6e 100644
--- a/bin/varnishtest/tests/r01206.vtc
+++ b/bin/varnishtest/tests/r01206.vtc
@@ -39,7 +39,7 @@ client c1 {
 server s1 -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.do_pass = true;
 	}
 }
diff --git a/bin/varnishtest/tests/r01253.vtc b/bin/varnishtest/tests/r01253.vtc
index c1d88ff..869f0a6 100644
--- a/bin/varnishtest/tests/r01253.vtc
+++ b/bin/varnishtest/tests/r01253.vtc
@@ -1,4 +1,4 @@
-varnishtest "restarting a pass in vcl_fetch should not panic"
+varnishtest "restarting a pass in vcl_response should not panic"
 
 server s1 {
 	rxreq
@@ -12,7 +12,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.status != 200) {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/r01283.vtc b/bin/varnishtest/tests/r01283.vtc
index 9283209..9d5bd81 100644
--- a/bin/varnishtest/tests/r01283.vtc
+++ b/bin/varnishtest/tests/r01283.vtc
@@ -11,7 +11,7 @@ varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend
 			error 500;
 		}
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "Transient";
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01284.vtc b/bin/varnishtest/tests/r01284.vtc
index 33a2a08..485a05d 100644
--- a/bin/varnishtest/tests/r01284.vtc
+++ b/bin/varnishtest/tests/r01284.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.storage = "Transient";
 	}
 } -start
diff --git a/bin/varnishtest/tests/s00002.vtc b/bin/varnishtest/tests/s00002.vtc
index ab3736e..4759635 100644
--- a/bin/varnishtest/tests/s00002.vtc
+++ b/bin/varnishtest/tests/s00002.vtc
@@ -47,7 +47,7 @@ varnish v1 -vcl {
 			.initial = 0;
 			} 
 		}
-	sub vcl_fetch { 
+	sub vcl_response { 
 		set beresp.ttl = 1s; 
 		set beresp.grace = 1m; 
 	}
diff --git a/bin/varnishtest/tests/s00003.vtc b/bin/varnishtest/tests/s00003.vtc
index b7476d7..09f8572 100644
--- a/bin/varnishtest/tests/s00003.vtc
+++ b/bin/varnishtest/tests/s00003.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl = 1s;
 		set beresp.grace = 10m;
 		if (beresp.http.foo == "2")
diff --git a/bin/varnishtest/tests/v00000.vtc b/bin/varnishtest/tests/v00000.vtc
index 697dc53..a9a02b1 100644
--- a/bin/varnishtest/tests/v00000.vtc
+++ b/bin/varnishtest/tests/v00000.vtc
@@ -12,7 +12,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.grace += 1 s;
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl += 1 m;
 		set beresp.grace += 1 h;
 	}
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index 922cd15..3b8492c 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/bin/varnishtest/tests/v00001.vtc
@@ -26,7 +26,7 @@ varnish v1 -vcl+backend {
 		set bereq.proto = "HTTP/1.2";
 		set bereq.method = "GET";
 	}
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.foobar =
 		    beresp.proto + beresp.response + beresp.status;
 		set beresp.proto = "HTTP/1.2";
diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 19405cc..d08dcc1 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -25,7 +25,7 @@ varnish v1 -storage "-smalloc,1m" -vcl+backend {
 
 	import debug from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so";
 
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.http.panic == "fetch") {
 			debug.panic("Had Panic header: " + beresp.http.panic);
 		}
diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 5b17ed6..50f82d2 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -60,7 +60,7 @@ varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 
 	/* test time and backend comparison */
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.ttl > 1d) {
 			set beresp.ttl = 1d;
 		}
@@ -75,12 +75,12 @@ varnish v1 -vcl {
 
 varnish v1 -errvcl {Unknown time unit 'k'.  Legal are 's', 'm', 'h' and 'd'} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set obj.ttl = 1. k; }
+	sub vcl_response { set obj.ttl = 1. k; }
 }
 
 varnish v1 -errvcl {Expression has type DURATION, expected BOOL} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { if (obj.ttl *= 2) { } }
+	sub vcl_response { if (obj.ttl *= 2) { } }
 }
 
 varnish v1 -errvcl {Operator > not possible on BACKEND} {
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 7bc0b05..39d6eec 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -8,14 +8,14 @@ varnish v1 -vcl {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { error beresp.status ; }
+	sub vcl_response { error beresp.status ; }
 }
 
 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_fetch { error beresp.status req.url; }
+	sub vcl_response { error beresp.status req.url; }
 }
 
 varnish v1 -errvcl {Variable 'server.port' is read only.} {
@@ -25,12 +25,12 @@ varnish v1 -errvcl {Variable 'server.port' is read only.} {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.ttl /= 2; }
+	sub vcl_response { set beresp.ttl /= 2; }
 }
 
 varnish v1 -errvcl {Expected '=' got '>>'} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.ttl >>= 2; }
+	sub vcl_response { set beresp.ttl >>= 2; }
 }
 
 varnish v1 -errvcl {Expected '=' got '+='} {
@@ -61,27 +61,27 @@ varnish v1 -vcl {
 
 varnish v1 -errvcl {Expected '=' got '+='} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.do_gzip += 1; }
+	sub vcl_response { set beresp.do_gzip += 1; }
 }
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.do_gzip = true; }
+	sub vcl_response { set beresp.do_gzip = true; }
 }
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.do_gzip = false; }
+	sub vcl_response { set beresp.do_gzip = false; }
 }
 
 varnish v1 -errvcl {Symbol not found: 'mu' (expected type BOOL):} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { set beresp.do_gzip = mu; }
+	sub vcl_response { set beresp.do_gzip = mu; }
 }
 
 varnish v1 -errvcl {Only http header variables can be unset.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch { unset beresp.do_gzip; }
+	sub vcl_response { unset beresp.do_gzip; }
 }
 
 varnish v1 -errvcl {Unknown token '<<' when looking for STRING} {
diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index bcdebac..87227d3 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -24,7 +24,7 @@ varnish v1 -errvcl {Expected an action, 'if', } " sub vcl_recv { { } { "
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.ttl = 1w;
 		set beresp.ttl *= 1.5;
 		set beresp.ttl = 1.5 s * 2.5;
@@ -73,20 +73,20 @@ varnish v1 -errvcl {Operator * not possible on type STRING.} {
 }
 
 varnish v1 -errvcl {DURATION + INT not possible.} {
-	sub vcl_fetch {
+	sub vcl_response {
 		set req.http.foo = req.grace + beresp.status;
 	}
 }
 
 varnish v1 -errvcl {'!' must be followed by BOOL, found DURATION.} {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (! req.grace) {
 		}
 	}
 }
 
 varnish v1 -errvcl {Operator + not possible on type BOOL.} {
-	sub vcl_fetch {
+	sub vcl_response {
 		if (beresp.do_gzip + beresp.do_gunzip) {
 		}
 	}
@@ -226,7 +226,7 @@ varnish v1 -errvcl {DURATION + STRING not possible.} {
 
 varnish v1 -errvcl {'||' must be followed by BOOL, found DURATION.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url || beresp.ttl) {
 		}
 	}
@@ -234,7 +234,7 @@ varnish v1 -errvcl {'||' must be followed by BOOL, found DURATION.} {
 
 varnish v1 -errvcl {'&&' must be followed by BOOL, found DURATION.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch {
+	sub vcl_response {
 		if (req.url && beresp.ttl) {
 		}
 	}
@@ -242,7 +242,7 @@ varnish v1 -errvcl {'&&' must be followed by BOOL, found DURATION.} {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_fetch {
+	sub vcl_response {
 		if (!req.url) {
 		}
 	}
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index aab2c83..ab77fdf 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/bin/varnishtest/tests/v00025.vtc
@@ -16,7 +16,7 @@ sub vcl_deliver {
 	set resp.http.server_port = server.port;
 }
 
-sub vcl_fetch {
+sub vcl_response {
 	if (req.esi) {
 		set beresp.http.esi = "yes";
 	}
diff --git a/bin/varnishtest/tests/v00032.vtc b/bin/varnishtest/tests/v00032.vtc
index 8bf4c69..f18adaa 100644
--- a/bin/varnishtest/tests/v00032.vtc
+++ b/bin/varnishtest/tests/v00032.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.has_s0 = storage.s0;
 		set beresp.http.has_foo = storage.foo;
 		set beresp.http.has_Transient = storage.Transient;
diff --git a/bin/varnishtest/tests/v00033.vtc b/bin/varnishtest/tests/v00033.vtc
index ceb5c12..504ad5a 100644
--- a/bin/varnishtest/tests/v00033.vtc
+++ b/bin/varnishtest/tests/v00033.vtc
@@ -10,7 +10,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_fetch {
+	sub vcl_response {
 		set beresp.http.foo =
 		    storage.nowhere.free_space +
 		    1 B + 1 KB + 1 MB + 1GB + 1TB;
diff --git a/etc/zope-plone.vcl b/etc/zope-plone.vcl
index 3127f18..de599dd 100644
--- a/etc/zope-plone.vcl
+++ b/etc/zope-plone.vcl
@@ -90,7 +90,7 @@ sub vcl_miss {
 # Enforce a minimum TTL, since we can PURGE changed objects actively
 # from Zope by using the CacheFu product
 
-sub vcl_fetch {
+sub vcl_response {
         if (beresp.ttl < 3600s) {
                 set beresp.ttl = 3600s;
         }
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index a12f296..51dc8b6 100755
--- a/lib/libvcl/generate.py
+++ b/lib/libvcl/generate.py
@@ -84,7 +84,7 @@ returns =(
 	('hash',	('hash',)),
 	('miss',	('error', 'restart', 'pass', 'fetch',)),
 	('hit',		('error', 'restart', 'pass', 'deliver',)),
-	('fetch',	('error', 'restart', 'deliver',)),
+	('response',	('error', 'restart', 'deliver',)),
 	('deliver',	('restart', 'deliver',)),
 	('error',	('restart', 'deliver',)),
 	('init',	('ok',)),
@@ -208,8 +208,8 @@ sp_variables = (
 	),
 	('req.esi',
 		'BOOL',
-		( 'recv', 'fetch', 'deliver', 'error',),
-		( 'recv', 'fetch', 'deliver', 'error',),
+		( 'recv', 'response', 'deliver', 'error',),
+		( 'recv', 'response', 'deliver', 'error',),
 		'struct req *'
 	),
 	('req.can_gzip',
@@ -238,32 +238,32 @@ sp_variables = (
 	),
 	('bereq.method',
 		'STRING',
-		( 'pipe', 'pass', 'miss', 'fetch',),
-		( 'pipe', 'pass', 'miss', 'fetch',),
+		( 'pipe', 'pass', 'miss', 'response',),
+		( 'pipe', 'pass', 'miss', 'response',),
 		'const struct req *'
 	),
 	('bereq.request',
 		'STRING',
-		( 'pipe', 'pass', 'miss', 'fetch',),
-		( 'pipe', 'pass', 'miss', 'fetch',),
+		( 'pipe', 'pass', 'miss', 'response',),
+		( 'pipe', 'pass', 'miss', 'response',),
 		'const struct req *'
 	),
 	('bereq.url',
 		'STRING',
-		( 'pipe', 'pass', 'miss', 'fetch',),
-		( 'pipe', 'pass', 'miss', 'fetch',),
+		( 'pipe', 'pass', 'miss', 'response',),
+		( 'pipe', 'pass', 'miss', 'response',),
 		'const struct req *'
 	),
 	('bereq.proto',
 		'STRING',
-		( 'pipe', 'pass', 'miss', 'fetch',),
-		( 'pipe', 'pass', 'miss', 'fetch',),
+		( 'pipe', 'pass', 'miss', 'response',),
+		( 'pipe', 'pass', 'miss', 'response',),
 		'const struct req *'
 	),
 	('bereq.http.',
 		'HEADER',
-		( 'pipe', 'pass', 'miss', 'fetch',),
-		( 'pipe', 'pass', 'miss', 'fetch',),
+		( 'pipe', 'pass', 'miss', 'response',),
+		( 'pipe', 'pass', 'miss', 'response',),
 		'const struct req *'
 	),
 	('bereq.connect_timeout',
@@ -286,104 +286,104 @@ sp_variables = (
 	),
 	('beresp.proto',
 		'STRING',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.saintmode',
 		'DURATION',
 		( ),
-		( 'fetch',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.status',
 		'INT',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.response',
 		'STRING',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.http.',
 		'HEADER',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.do_esi',
 		'BOOL',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.do_stream',
 		'BOOL',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.do_gzip',
 		'BOOL',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.do_gunzip',
 		'BOOL',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.do_pass',
 		'BOOL',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'const struct req *'
 	),
 	('beresp.ttl',
 		'DURATION',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'struct req *'
 	),
 	('beresp.grace',
 		'DURATION',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'struct req *'
 	),
 	('beresp.keep',
 		'DURATION',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'struct req *'
 	),
 	('beresp.backend.name',
 		'STRING',
-		( 'fetch',),
+		( 'response',),
 		( ),
 		'const struct req *'
 	),
 	('beresp.backend.ip',
 		'IP',
-		( 'fetch',),
+		( 'response',),
 		( ),
 		'const struct req *'
 	),
 	('beresp.backend.port',
 		'INT',
-		( 'fetch',),
+		( 'response',),
 		( ),
 		'const struct req *'
 	),
 	('beresp.storage',
 		'STRING',
-		( 'fetch',),
-		( 'fetch',),
+		( 'response',),
+		( 'response',),
 		'struct req *'
 	),
 	('obj.proto',
diff --git a/lib/libvcl/vcc_action.c b/lib/libvcl/vcc_action.c
index 7d5ea2e..de899cb 100644
--- a/lib/libvcl/vcc_action.c
+++ b/lib/libvcl/vcc_action.c
@@ -372,7 +372,7 @@ static struct action_table {
 } action_table[] = {
 	{ "error",		parse_error,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH |
-            VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH
+            VCL_MET_MISS | VCL_MET_HIT | VCL_MET_RESPONSE
 	},
 
 #define VCL_RET_MAC(l, U, B)						\



More information about the varnish-commit mailing list