Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
5574f03f
Commit
5574f03f
authored
Feb 23, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make VCC report when symbols require a different syntax
parent
b042383f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
14 deletions
+22
-14
v00021.vtc
bin/varnishtest/tests/v00021.vtc
+10
-0
vcc_symb.c
lib/libvcc/vcc_symb.c
+12
-14
No files found.
bin/varnishtest/tests/v00021.vtc
View file @
5574f03f
...
@@ -121,3 +121,13 @@ varnish v1 -errvcl {Symbol 'default' is a reserved word.} {
...
@@ -121,3 +121,13 @@ varnish v1 -errvcl {Symbol 'default' is a reserved word.} {
}
}
}
}
varnish v1 -syntax 4.1 -errvcl {(Only available when VCL syntax <= 4.0)} {
sub vcl_recv {
set req.esi = false;
}
}
varnish v1 -syntax 4.0 -errvcl {(Only available when 4.1 <= VCL syntax)} {
sub vcl_deliver {
set resp.do_esi = false;
}
}
lib/libvcc/vcc_symb.c
View file @
5574f03f
...
@@ -220,24 +220,22 @@ VCC_SymbolGet(struct vcc *tl, vcc_kind_t kind, const char *e, const char *x)
...
@@ -220,24 +220,22 @@ VCC_SymbolGet(struct vcc *tl, vcc_kind_t kind, const char *e, const char *x)
if
(
sym
==
NULL
)
{
if
(
sym
==
NULL
)
{
VSB_printf
(
tl
->
sb
,
"%s: "
,
e
);
VSB_printf
(
tl
->
sb
,
"%s: "
,
e
);
vcc_ErrToken
(
tl
,
tl
->
t
);
vcc_ErrToken
(
tl
,
tl
->
t
);
VSB_cat
(
tl
->
sb
,
"
\n
At: "
);
sym
=
VCC_Symbol
(
tl
,
NULL
,
tl
->
t
->
b
,
tl
->
t
->
e
,
kind
,
0
,
vcc_ErrWhere
(
tl
,
tl
->
t
);
VCL_LOW
,
VCL_HIGH
);
return
(
NULL
);
if
(
sym
!=
NULL
)
{
VSB_printf
(
tl
->
sb
,
" (Only available when"
);
if
(
sym
->
lorev
>=
VCL_LOW
)
VSB_printf
(
tl
->
sb
,
" %.1f <="
,
.
1
*
sym
->
lorev
);
VSB_printf
(
tl
->
sb
,
" VCL syntax"
);
if
(
sym
->
hirev
<=
VCL_HIGH
)
VSB_printf
(
tl
->
sb
,
" <= %.1f"
,
.
1
*
sym
->
hirev
);
VSB_printf
(
tl
->
sb
,
")"
);
}
}
if
(
sym
->
lorev
>
tl
->
syntax
||
sym
->
hirev
<
tl
->
syntax
)
{
VSB_printf
(
tl
->
sb
,
"Symbol "
);
vcc_ErrToken
(
tl
,
tl
->
t
);
if
(
sym
->
lorev
>
tl
->
syntax
)
VSB_printf
(
tl
->
sb
,
" needs vcl %.1f or higher."
,
.
1
*
sym
->
lorev
);
else
VSB_printf
(
tl
->
sb
,
" is discontinued after vcl %.1f."
,
.
1
*
sym
->
hirev
);
VSB_cat
(
tl
->
sb
,
"
\n
At: "
);
VSB_cat
(
tl
->
sb
,
"
\n
At: "
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
(
NULL
);
return
(
NULL
);
}
}
assert
(
sym
->
lorev
<=
tl
->
syntax
&&
sym
->
hirev
>=
tl
->
syntax
);
if
(
kind
!=
SYM_NONE
&&
kind
!=
sym
->
kind
)
{
if
(
kind
!=
SYM_NONE
&&
kind
!=
sym
->
kind
)
{
VSB_printf
(
tl
->
sb
,
"Symbol "
);
VSB_printf
(
tl
->
sb
,
"Symbol "
);
vcc_ErrToken
(
tl
,
tl
->
t
);
vcc_ErrToken
(
tl
,
tl
->
t
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment