Commit ff1545b0 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Switch to return(foo) syntax through out



git-svn-id: http://www.varnish-cache.org/svn/trunk@4612 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 9fc89678
...@@ -9,7 +9,7 @@ server s1 -repeat 1 { ...@@ -9,7 +9,7 @@ server s1 -repeat 1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
pipe; return(pipe);
} }
} -start } -start
......
...@@ -9,7 +9,7 @@ server s1 { ...@@ -9,7 +9,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
pass; return(pass);
} }
} -start } -start
......
...@@ -32,7 +32,7 @@ varnish v1 -vcl { ...@@ -32,7 +32,7 @@ varnish v1 -vcl {
sub vcl_recv { sub vcl_recv {
if (req.url == "from_backend") { if (req.url == "from_backend") {
set req.backend = b1; set req.backend = b1;
pass; return(pass);
} }
set req.backend = b2; set req.backend = b2;
} }
......
...@@ -13,7 +13,7 @@ server s1 { ...@@ -13,7 +13,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_hit { sub vcl_hit {
pass; return(pass);
} }
} -start } -start
......
...@@ -13,7 +13,7 @@ server s1 { ...@@ -13,7 +13,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_fetch { sub vcl_fetch {
pass; return(pass);
} }
} -start } -start
......
...@@ -13,7 +13,7 @@ server s1 { ...@@ -13,7 +13,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_miss { sub vcl_miss {
pass; return(pass);
} }
} -start } -start
......
...@@ -17,7 +17,7 @@ server s1 { ...@@ -17,7 +17,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_fetch { sub vcl_fetch {
pass; return(pass);
} }
} -start } -start
......
...@@ -16,7 +16,7 @@ varnish v1 -vcl+backend { ...@@ -16,7 +16,7 @@ varnish v1 -vcl+backend {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
pass; return (pass);
} }
} }
......
...@@ -20,7 +20,7 @@ server s1 { ...@@ -20,7 +20,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_fetch { sub vcl_fetch {
esi; esi;
pass; return(pass);
} }
} -start } -start
......
...@@ -10,7 +10,7 @@ server s1 { ...@@ -10,7 +10,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_fetch { sub vcl_fetch {
esi; esi;
pass; return(pass);
} }
} -start } -start
......
...@@ -24,7 +24,7 @@ varnish v1 -vcl+backend { ...@@ -24,7 +24,7 @@ varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
if (req.request == "POST") { if (req.request == "POST") {
/* Lookup so we find any cached object */ /* Lookup so we find any cached object */
lookup; return (lookup);
} }
} }
sub vcl_hit { sub vcl_hit {
...@@ -32,13 +32,13 @@ varnish v1 -vcl+backend { ...@@ -32,13 +32,13 @@ varnish v1 -vcl+backend {
/* Get rid of this object */ /* Get rid of this object */
set obj.cacheable = false; set obj.cacheable = false;
set obj.ttl = 0s; set obj.ttl = 0s;
pass; return (pass);
} }
} }
sub vcl_miss { sub vcl_miss {
if (req.request == "POST") { if (req.request == "POST") {
/* Make sure we don't cache the POST result */ /* Make sure we don't cache the POST result */
pass; return (pass);
} }
} }
} -start } -start
......
...@@ -22,7 +22,7 @@ server s1 { ...@@ -22,7 +22,7 @@ server s1 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
if (req.url ~ "bar") { if (req.url ~ "bar") {
pass; return(pass);
} }
} }
} -start -cliok "param.set diag_bitmap 0x10000" } -start -cliok "param.set diag_bitmap 0x10000"
......
...@@ -26,7 +26,7 @@ varnish v1 -vcl+backend { ...@@ -26,7 +26,7 @@ varnish v1 -vcl+backend {
set beresp.saintmode = 2s; set beresp.saintmode = 2s;
restart; restart;
} }
deliver; return(deliver);
} }
} -start } -start
......
...@@ -17,7 +17,7 @@ varnish v1 -vcl { ...@@ -17,7 +17,7 @@ varnish v1 -vcl {
.max_connections = 1; .max_connections = 1;
} }
sub vcl_recv { sub vcl_recv {
pass; return(pass);
} }
} -start } -start
......
...@@ -47,11 +47,11 @@ varnish v1 -vcl { ...@@ -47,11 +47,11 @@ varnish v1 -vcl {
/* Test string regexp matching and "else if" */ /* Test string regexp matching and "else if" */
sub vcl_recv { sub vcl_recv {
if ((req.url ~ "foobar")) { if ((req.url ~ "foobar")) {
pass; return(pass);
} else if (req.url ~ "snafu") { } else if (req.url ~ "snafu") {
pipe; return(pipe);
} else { } else {
pass; return(pass);
} }
} }
} }
......
...@@ -5,13 +5,13 @@ test "VCL compiler coverage test: vcc_acl.c" ...@@ -5,13 +5,13 @@ test "VCL compiler coverage test: vcc_acl.c"
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { "10.1.2.3"/33; } acl a { "10.1.2.3"/33; }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { "1::2"/129; } acl a { "1::2"/129; }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -vcl { varnish v1 -vcl {
...@@ -20,7 +20,7 @@ varnish v1 -vcl { ...@@ -20,7 +20,7 @@ varnish v1 -vcl {
"1.2.3.4"/31; "1.2.3.4"/31;
"1.2.3.4"/31; "1.2.3.4"/31;
} }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
...@@ -29,31 +29,31 @@ varnish v1 -badvcl { ...@@ -29,31 +29,31 @@ varnish v1 -badvcl {
"1.2.3.4"; "1.2.3.4";
!"1.2.3.4"; !"1.2.3.4";
} }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { "...com"; } acl a { "...com"; }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { "10.1.2."; } acl a { "10.1.2."; }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { ( "10.1.2"; } acl a { ( "10.1.2"; }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
acl a { "10.1.2" ); } acl a { "10.1.2" ); }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -vcl { varnish v1 -vcl {
...@@ -63,18 +63,18 @@ varnish v1 -vcl { ...@@ -63,18 +63,18 @@ varnish v1 -vcl {
("...com" / 22); ("...com" / 22);
(!"...com"); (!"...com");
} }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
varnish v1 -vcl { varnish v1 -vcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
sub vcl_recv { if (client.ip == "127.0.0.1") { pass; } } sub vcl_recv { if (client.ip == "127.0.0.1") { return(pass); } }
sub vcl_miss { if (client.ip != "127.0.0.1") { pass; } } sub vcl_miss { if (client.ip != "127.0.0.1") { return(pass); } }
} }
varnish v1 -badvcl { varnish v1 -badvcl {
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
sub vcl_recv { if (client.ip > "127.0.0.1") { pass; } } sub vcl_recv { if (client.ip > "127.0.0.1") { return(pass); } }
} }
varnish v1 -vcl { varnish v1 -vcl {
...@@ -90,6 +90,6 @@ varnish v1 -vcl { ...@@ -90,6 +90,6 @@ varnish v1 -vcl {
! "10.2.64"/23; ! "10.2.64"/23;
"10.2.68"/23; "10.2.68"/23;
} }
sub vcl_recv { if (client.ip ~ a) { pass; } } sub vcl_recv { if (client.ip ~ a) { return(pass); } }
} }
...@@ -43,7 +43,7 @@ varnish v1 -vcl+backend { ...@@ -43,7 +43,7 @@ varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
set req.backend = foo; set req.backend = foo;
pass; return(pass);
} }
} -start } -start
......
...@@ -25,7 +25,7 @@ varnish v1 -vcl+backend { ...@@ -25,7 +25,7 @@ varnish v1 -vcl+backend {
sub vcl_recv { sub vcl_recv {
set req.backend = h1; set req.backend = h1;
pass; return(pass);
} }
} -start } -start
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment