[master] 05a462d Rename vcl_error{} to vcl_synth{}
Poul-Henning Kamp
phk at FreeBSD.org
Tue Mar 18 17:31:55 CET 2014
commit 05a462d98c3ee38c862c9006924f8555d133f95d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Mar 18 16:31:34 2014 +0000
Rename vcl_error{} to vcl_synth{}
diff --git a/bin/varnishd/builtin.vcl b/bin/varnishd/builtin.vcl
index ac795fd..cdac8d9 100644
--- a/bin/varnishd/builtin.vcl
+++ b/bin/varnishd/builtin.vcl
@@ -126,7 +126,7 @@ sub vcl_deliver {
/*
* We can come here "invisibly" with the following errors: 413, 417 & 503
*/
-sub vcl_error {
+sub vcl_synth {
set resp.http.Content-Type = "text/html; charset=utf-8";
set resp.http.Retry-After = "5";
synthetic( {"
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index f43416f..792b1ec 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -193,7 +193,7 @@ cnt_error(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
- req->acct_req.error++;
+ req->acct_req.synth++;
HTTP_Setup(req->resp, req->ws, req->vsl, SLT_RespMethod);
h = req->resp;
@@ -219,7 +219,7 @@ cnt_error(struct worker *wrk, struct req *req)
req->synth_body = VSB_new_auto();
AN(req->synth_body);
- VCL_error_method(req->vcl, wrk, req, NULL, req->http->ws);
+ VCL_synth_method(req->vcl, wrk, req, NULL, req->http->ws);
http_Unset(h, H_Content_Length);
@@ -421,7 +421,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
case VCL_RET_RESTART:
req->req_step = R_STP_RESTART;
break;
- case VCL_RET_ERROR:
+ case VCL_RET_SYNTH:
req->req_step = R_STP_ERROR;
break;
case VCL_RET_PASS:
@@ -479,7 +479,7 @@ cnt_miss(struct worker *wrk, struct req *req)
VBF_Fetch(wrk, req, req->objcore, o, VBF_NORMAL);
req->req_step = R_STP_FETCH;
return (REQ_FSM_MORE);
- case VCL_RET_ERROR:
+ case VCL_RET_SYNTH:
req->req_step = R_STP_ERROR;
break;
case VCL_RET_RESTART:
@@ -527,7 +527,7 @@ cnt_pass(struct worker *wrk, struct req *req)
VCL_pass_method(req->vcl, wrk, req, NULL, req->http->ws);
switch (wrk->handling) {
- case VCL_RET_ERROR:
+ case VCL_RET_SYNTH:
req->req_step = R_STP_ERROR;
break;
case VCL_RET_RESTART:
@@ -583,7 +583,7 @@ cnt_pipe(struct worker *wrk, struct req *req)
VCL_pipe_method(req->vcl, wrk, req, bo, req->http->ws);
- if (wrk->handling == VCL_RET_ERROR)
+ if (wrk->handling == VCL_RET_SYNTH)
INCOMPL();
assert(wrk->handling == VCL_RET_PIPE);
@@ -754,7 +754,7 @@ cnt_recv(struct worker *wrk, struct req *req)
case VCL_RET_PASS:
req->req_step = R_STP_PASS;
return (REQ_FSM_MORE);
- case VCL_RET_ERROR:
+ case VCL_RET_SYNTH:
req->req_step = R_STP_ERROR;
return (REQ_FSM_MORE);
default:
diff --git a/bin/varnishtest/tests/b00017.vtc b/bin/varnishtest/tests/b00017.vtc
index dbe673b..81776bb 100644
--- a/bin/varnishtest/tests/b00017.vtc
+++ b/bin/varnishtest/tests/b00017.vtc
@@ -5,11 +5,11 @@ varnish v1 -vcl {
.host = "${bad_ip}"; .port = "9080";
}
sub vcl_recv {
- return (error(888));
+ return (synth(888));
}
- sub vcl_error {
- synthetic("Custom vcl_error's synth output");
+ sub vcl_synth {
+ synthetic("Custom vcl_synth's synth output");
return (deliver);
}
} -start
@@ -22,4 +22,4 @@ client c1 {
expect resp.http.connection != close
} -run
-varnish v1 -expect s_error == 1
+varnish v1 -expect s_synth == 1
diff --git a/bin/varnishtest/tests/b00019.vtc b/bin/varnishtest/tests/b00019.vtc
index 59ceb61..33d3dbc 100644
--- a/bin/varnishtest/tests/b00019.vtc
+++ b/bin/varnishtest/tests/b00019.vtc
@@ -25,7 +25,7 @@ varnish v1 -vcl+backend {
return (restart);
}
- sub vcl_error {
+ sub vcl_synth {
if (req.restarts == 2) {
set resp.status = 200;
set resp.reason = "restart=2";
diff --git a/bin/varnishtest/tests/b00030.vtc b/bin/varnishtest/tests/b00030.vtc
index a7b6c57..1115613 100644
--- a/bin/varnishtest/tests/b00030.vtc
+++ b/bin/varnishtest/tests/b00030.vtc
@@ -10,9 +10,9 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
- return (error(200,req.ttl));
+ return (synth(200,req.ttl));
}
- sub vcl_error {
+ sub vcl_synth {
set resp.http.x-timestamp = now;
}
} -start
diff --git a/bin/varnishtest/tests/c00022.vtc b/bin/varnishtest/tests/c00022.vtc
index 841d2cf..39ce5dc 100644
--- a/bin/varnishtest/tests/c00022.vtc
+++ b/bin/varnishtest/tests/c00022.vtc
@@ -22,11 +22,11 @@ varnish v1 -vcl+backend {
sub vcl_recv {
if (req.method == "PURGE") {
ban ("req.url == " + req.url);
- return (error(410));
+ return (synth(410));
}
if (req.method == "PURGESTR") {
ban ("" + req.http.ban);
- return (error(410));
+ return (synth(410));
}
}
} -start
diff --git a/bin/varnishtest/tests/c00024.vtc b/bin/varnishtest/tests/c00024.vtc
index 6167914..80b3c59 100644
--- a/bin/varnishtest/tests/c00024.vtc
+++ b/bin/varnishtest/tests/c00024.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test restart in vcl_error"
+varnishtest "Test restart in vcl_synth"
server s1 {
rxreq
@@ -8,10 +8,10 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.restarts == 0) {
- return (error(701, "FOO"));
+ return (synth(701, "FOO"));
}
}
- sub vcl_error {
+ sub vcl_synth {
if (req.restarts < 1) {
return (restart);
} else {
diff --git a/bin/varnishtest/tests/c00028.vtc b/bin/varnishtest/tests/c00028.vtc
index 91abe45..0ad1466 100644
--- a/bin/varnishtest/tests/c00028.vtc
+++ b/bin/varnishtest/tests/c00028.vtc
@@ -8,7 +8,7 @@ varnish v1 -vcl {
sub vcl_backend_fetch {
set bereq.backend = bad;
}
- sub vcl_error {
+ sub vcl_synth {
return (restart);
}
} -start
diff --git a/bin/varnishtest/tests/c00061.vtc b/bin/varnishtest/tests/c00061.vtc
index c99f324..ef2ae76 100644
--- a/bin/varnishtest/tests/c00061.vtc
+++ b/bin/varnishtest/tests/c00061.vtc
@@ -8,7 +8,7 @@ varnish v1 -vcl {
return (retry);
}
- sub vcl_error {
+ sub vcl_synth {
set resp.status = 504;
}
} -start
diff --git a/bin/varnishtest/tests/r00558.vtc b/bin/varnishtest/tests/r00558.vtc
index 3a8ba97..c889e79 100644
--- a/bin/varnishtest/tests/r00558.vtc
+++ b/bin/varnishtest/tests/r00558.vtc
@@ -7,7 +7,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
- return (error(501));
+ return (synth(501));
}
} -start
diff --git a/bin/varnishtest/tests/r00561.vtc b/bin/varnishtest/tests/r00561.vtc
index 1efc0a7..416a97d 100644
--- a/bin/varnishtest/tests/r00561.vtc
+++ b/bin/varnishtest/tests/r00561.vtc
@@ -1,4 +1,4 @@
-varnishtest "Junk request should not go to vcl_error"
+varnishtest "Junk request should not go to vcl_synth"
server s1 {
rxreq
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- sub vcl_error {
+ sub vcl_synth {
return (restart);
}
} -start
diff --git a/bin/varnishtest/tests/r00769.vtc b/bin/varnishtest/tests/r00769.vtc
index 451029c..6778648 100644
--- a/bin/varnishtest/tests/r00769.vtc
+++ b/bin/varnishtest/tests/r00769.vtc
@@ -8,7 +8,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.url ~ "^/test1") {
- return (error(700));
+ return (synth(700));
}
}
sub vcl_backend_response {
@@ -16,7 +16,7 @@ varnish v1 -vcl+backend {
set beresp.http.X-status = beresp.status;
return (deliver);
}
- sub vcl_error {
+ sub vcl_synth {
if (resp.status == 700) {
set resp.status=404;
set resp.http.X-status = resp.status;
diff --git a/bin/varnishtest/tests/r00896.vtc b/bin/varnishtest/tests/r00896.vtc
index c713a59..0e0c086 100644
--- a/bin/varnishtest/tests/r00896.vtc
+++ b/bin/varnishtest/tests/r00896.vtc
@@ -8,7 +8,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.http.host ~ "^(abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij)") {
- return (error(500,"not ok"));
+ return (synth(500,"not ok"));
}
}
} -start
diff --git a/bin/varnishtest/tests/r00936.vtc b/bin/varnishtest/tests/r00936.vtc
index 7e6ad64..ddb2f79 100644
--- a/bin/varnishtest/tests/r00936.vtc
+++ b/bin/varnishtest/tests/r00936.vtc
@@ -10,7 +10,7 @@ varnish v1 -errvcl {'synthetic': not a valid action in method 'vcl_recv'} {
sub vcl_recv {
synthetic("HELLOO");
- return (error(503));
+ return (synth(503));
}
}
diff --git a/bin/varnishtest/tests/r00965.vtc b/bin/varnishtest/tests/r00965.vtc
index d9cbdba..e094e3b 100644
--- a/bin/varnishtest/tests/r00965.vtc
+++ b/bin/varnishtest/tests/r00965.vtc
@@ -27,19 +27,19 @@ varnish v1 -vcl+backend {
}
}
- sub vcl_error {
+ sub vcl_synth {
if (resp.status == 988) { return (restart); }
}
sub vcl_miss {
if (req.http.X-Banned == "check") {
- return (error(988,"restarting"));
+ return (synth(988,"restarting"));
}
}
sub vcl_pass {
if (req.http.X-Banned == "check") {
- return (error(988,"restarting"));
+ return (synth(988,"restarting"));
}
}
} -start
diff --git a/bin/varnishtest/tests/r01027.vtc b/bin/varnishtest/tests/r01027.vtc
index d6d0991..716e6f0 100644
--- a/bin/varnishtest/tests/r01027.vtc
+++ b/bin/varnishtest/tests/r01027.vtc
@@ -1,9 +1,9 @@
varnishtest "Test if you can error in vcl_deliver"
-varnish v1 -errvcl {Invalid return "error"} {
+varnish v1 -errvcl {Invalid return "synth"} {
backend b { .host = "127.0.0.1"; }
sub vcl_deliver {
- return (error(201,"ok"));
+ return (synth(201,"ok"));
}
}
diff --git a/bin/varnishtest/tests/r01030.vtc b/bin/varnishtest/tests/r01030.vtc
index 543f93f..a84e3a5 100644
--- a/bin/varnishtest/tests/r01030.vtc
+++ b/bin/varnishtest/tests/r01030.vtc
@@ -16,7 +16,7 @@ varnish v1 -vcl+backend {
sub vcl_recv {
if (req.method == "BAN") {
ban("obj.http.url ~ /");
- return (error(201,"banned"));
+ return (synth(201,"banned"));
}
return (hash);
}
diff --git a/bin/varnishtest/tests/r01287.vtc b/bin/varnishtest/tests/r01287.vtc
index 7e329ac..bfb220a 100644
--- a/bin/varnishtest/tests/r01287.vtc
+++ b/bin/varnishtest/tests/r01287.vtc
@@ -5,9 +5,9 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
- return (error(200, "OK"));
+ return (synth(200, "OK"));
}
- sub vcl_error {
+ sub vcl_synth {
synthetic(resp.http.blank);
return (deliver);
}
diff --git a/bin/varnishtest/tests/r01367.vtc b/bin/varnishtest/tests/r01367.vtc
index 3a57258..18c9ca5 100644
--- a/bin/varnishtest/tests/r01367.vtc
+++ b/bin/varnishtest/tests/r01367.vtc
@@ -6,7 +6,7 @@ server s1 {
} -start
varnish v1 -vcl+backend {
- sub vcl_error {
+ sub vcl_synth {
return (restart);
}
} -start
diff --git a/bin/varnishtest/tests/r01395.vtc b/bin/varnishtest/tests/r01395.vtc
index acad0fe..591bb2e 100644
--- a/bin/varnishtest/tests/r01395.vtc
+++ b/bin/varnishtest/tests/r01395.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test vcl_error is called even if vcl_backend_fetch failed"
+varnishtest "Test vcl_synth is called even if vcl_backend_fetch failed"
varnish v1 -vcl {
backend default {
diff --git a/bin/varnishtest/tests/v00011.vtc b/bin/varnishtest/tests/v00011.vtc
index 3a3d842..0f470ec 100644
--- a/bin/varnishtest/tests/v00011.vtc
+++ b/bin/varnishtest/tests/v00011.vtc
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
ban("req.url == bar //");
ban("foo == bar //");
ban("req.url ~ ^/$");
- return (error(209,"foo"));
+ return (synth(209,"foo"));
}
}
diff --git a/bin/varnishtest/tests/v00014.vtc b/bin/varnishtest/tests/v00014.vtc
index 3a48188..8f776b7 100644
--- a/bin/varnishtest/tests/v00014.vtc
+++ b/bin/varnishtest/tests/v00014.vtc
@@ -28,9 +28,9 @@ varnish v1 -vcl {
sub vcl_recv {
if (std.healthy(default)) {
- return(error(200,"Backend healthy"));
+ return(synth(200,"Backend healthy"));
} else {
- return(error(500,"Backend sick"));
+ return(synth(500,"Backend sick"));
}
}
} -start
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 9e97762..004ec15 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -8,8 +8,8 @@ varnish v1 -vcl {
varnish v1 -vcl {
backend b { .host = "127.0.0.1"; }
- sub vcl_miss { return(error(100,req.url)); }
- sub vcl_hit { return(error(100,"the butter please")); }
+ sub vcl_miss { return(synth(100,req.url)); }
+ sub vcl_hit { return(synth(100,"the butter please")); }
}
varnish v1 -errvcl {Variable 'now' is read only.} {
@@ -39,7 +39,7 @@ varnish v1 -errvcl {Expected '=' got '+='} {
varnish v1 -errvcl {Expected ';' got 'if'} {
backend b { .host = "127.0.0.1"; }
- /* XXX: This should not really be an error */
+ /* XXX: This should not really be an synth */
sub vcl_recv { set req.url = "foo" if "bar"; }
}
@@ -100,15 +100,10 @@ varnish v1 -errvcl {Expected an action, 'if', '{' or '}'} {
varnish v1 -errvcl {Unknown token '<<' when looking for STRING_LIST} {
backend b { .host = "127.0.0.1"; }
- sub vcl_error { synthetic( << "foo"; }
+ sub vcl_synth { synthetic( << "foo"; }
}
varnish v1 -errvcl {Syntax has changed, use:} {
backend b { .host = "127.0.0.1"; }
- sub vcl_recv { error 200; }
-}
-
-varnish v1 -errvcl {Syntax has changed, use:} {
- backend b { .host = "127.0.0.1"; }
- sub vcl_recv { return(error); }
+ sub vcl_recv { return(synth); }
}
diff --git a/bin/varnishtest/tests/v00024.vtc b/bin/varnishtest/tests/v00024.vtc
index f112559..e502eee 100644
--- a/bin/varnishtest/tests/v00024.vtc
+++ b/bin/varnishtest/tests/v00024.vtc
@@ -9,7 +9,7 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.http.etag == req.http.if-none-match) {
- return(error(400,"FOO"));
+ return(synth(400,"FOO"));
}
}
} -start
diff --git a/include/tbl/acct_fields.h b/include/tbl/acct_fields.h
index 1184240..ac205a7 100644
--- a/include/tbl/acct_fields.h
+++ b/include/tbl/acct_fields.h
@@ -35,6 +35,6 @@ ACCT(req)
ACCT(pipe)
ACCT(pass)
ACCT(fetch)
-ACCT(error)
+ACCT(synth)
ACCT(hdrbytes)
ACCT(bodybytes)
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index d72b325..3874ec1 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -380,8 +380,8 @@ VSC_F(s_fetch, uint64_t, 1, 'a', info,
"Total fetch",
""
)
-VSC_F(s_error, uint64_t, 1, 'a', info,
- "Total error",
+VSC_F(s_synth, uint64_t, 1, 'a', info,
+ "Total synth",
""
)
VSC_F(s_hdrbytes, uint64_t, 1, 'a', info,
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 523f05f..7b9ab4e 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -84,15 +84,15 @@ returns =(
('recv',
"C",
- ('error', 'pass', 'pipe', 'hash', 'purge',)
+ ('synth', 'pass', 'pipe', 'hash', 'purge',)
),
('pipe',
"C",
- ('error', 'pipe',)
+ ('synth', 'pipe',)
),
('pass',
"C",
- ('error', 'restart', 'fetch',)
+ ('synth', 'restart', 'fetch',)
),
('hash',
"C",
@@ -100,21 +100,21 @@ returns =(
),
('purge',
"C",
- ('error', 'fetch',)
+ ('synth', 'fetch',)
),
('miss',
"C",
- ('error', 'restart', 'pass', 'fetch',)
+ ('synth', 'restart', 'pass', 'fetch',)
),
('hit',
"C",
- ('error', 'restart', 'pass', 'fetch', 'deliver',)
+ ('synth', 'restart', 'pass', 'fetch', 'deliver',)
),
('deliver',
"C",
('restart', 'deliver',)
),
- ('error',
+ ('synth',
"C",
('restart', 'deliver',)
),
@@ -254,8 +254,8 @@ sp_variables = [
),
('req.esi',
'BOOL',
- ( 'recv', 'backend_response', 'deliver', 'error',),
- ( 'recv', 'backend_response', 'deliver', 'error',), """
+ ( 'recv', 'backend_response', 'deliver', 'synth',),
+ ( 'recv', 'backend_response', 'deliver', 'synth',), """
Boolean. Set to false to disable ESI processing
regardless of any value in beresp.do_esi. Defaults
to true. This variable is subject to change in
@@ -497,15 +497,15 @@ sp_variables = [
),
('obj.status',
'INT',
- ( 'error',),
- ( 'error',), """
+ ( 'synth',),
+ ( 'synth',), """
The HTTP status code returned by the server.
"""
),
('obj.reason',
'STRING',
- ( 'error',),
- ( 'error',), """
+ ( 'synth',),
+ ( 'synth',), """
The HTTP status message returned by the server.
"""
),
@@ -563,29 +563,29 @@ sp_variables = [
),
('resp.proto',
'STRING',
- ( 'deliver', 'error', ),
- ( 'deliver', 'error', ), """
+ ( 'deliver', 'synth', ),
+ ( 'deliver', 'synth', ), """
The HTTP protocol version to use for the response.
"""
),
('resp.status',
'INT',
- ( 'deliver', 'error', ),
- ( 'deliver', 'error', ), """
+ ( 'deliver', 'synth', ),
+ ( 'deliver', 'synth', ), """
The HTTP status code that will be returned.
"""
),
('resp.reason',
'STRING',
- ( 'deliver', 'error', ),
- ( 'deliver', 'error', ), """
+ ( 'deliver', 'synth', ),
+ ( 'deliver', 'synth', ), """
The HTTP status message that will be returned.
"""
),
('resp.http.',
'HEADER',
- ( 'deliver', 'error', ),
- ( 'deliver', 'error', ), """
+ ( 'deliver', 'synth', ),
+ ( 'deliver', 'synth', ), """
The corresponding HTTP header.
"""
),
@@ -1011,6 +1011,7 @@ def one_var(nm, spec):
if nm == i[0]:
fh.write("VCL_" + typ +
" VRT_r_%s(const struct vrt_ctx *);\n" % cnam )
+ print(spec)
restrict(fo, spec[2])
if len(spec[3]) == 0:
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index 5ed9146..602beff 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -54,21 +54,6 @@ parse_call(struct vcc *tl)
/*--------------------------------------------------------------------*/
-static void
-parse_error(struct vcc *tl)
-{
-
- VSB_printf(tl->sb,
- "Syntax has changed, use:\n"
- "\treturn(error(999));\n"
- "or\n"
- "\treturn(error(999, \"Response text\"));\n");
- vcc_ErrWhere(tl, tl->t);
- return;
-}
-
-/*--------------------------------------------------------------------*/
-
static const struct arith {
enum var_type type;
unsigned oper;
@@ -311,14 +296,14 @@ parse_return(struct vcc *tl)
ExpectErr(tl, ID);
/* 'error' gets special handling, to allow optional status/response */
- if (vcc_IdIs(tl->t, "error")) {
+ if (vcc_IdIs(tl->t, "synth")) {
vcc_NextToken(tl);
if (tl->t->tok == ')') {
VSB_printf(tl->sb,
"Syntax has changed, use:\n"
- "\treturn(error(999));\n"
+ "\treturn(synth(999));\n"
"or\n"
- "\treturn(error(999, \"Response text\"));\n");
+ "\treturn(synth(999, \"Response text\"));\n");
vcc_ErrWhere(tl, tl->t);
return;
}
@@ -340,9 +325,9 @@ parse_return(struct vcc *tl)
ExpectErr(tl, ')');
vcc_NextToken(tl);
Fb(tl, 1, ");\n");
- Fb(tl, 1, "VRT_handling(ctx, VCL_RET_ERROR);\n");
+ Fb(tl, 1, "VRT_handling(ctx, VCL_RET_SYNTH);\n");
Fb(tl, 1, "return (1);\n");
- vcc_ProcAction(tl->curproc, VCL_RET_ERROR, tl->t);
+ vcc_ProcAction(tl->curproc, VCL_RET_SYNTH, tl->t);
ExpectErr(tl, ')');
vcc_NextToken(tl);
return;
@@ -422,7 +407,6 @@ static struct action_table {
/* Keep list sorted from here */
{ "ban", parse_ban },
{ "call", parse_call },
- { "error", parse_error },
{ "hash_data", parse_hash_data, VCL_MET_HASH },
{ "new", parse_new, VCL_MET_INIT},
{ "purge", parse_purge, VCL_MET_MISS | VCL_MET_HIT },
@@ -430,7 +414,7 @@ static struct action_table {
{ "rollback", parse_rollback },
{ "set", parse_set },
{ "synthetic", parse_synthetic,
- VCL_MET_ERROR | VCL_MET_BACKEND_ERROR },
+ VCL_MET_SYNTH | VCL_MET_BACKEND_ERROR },
{ "unset", parse_unset },
{ NULL, NULL }
};
More information about the varnish-commit
mailing list