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
b75d595d
Commit
b75d595d
authored
Dec 07, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be more clear about redefining symbols of different expected type
Fixes #2021
parent
d31792a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
c00005.vtc
bin/varnishtest/tests/c00005.vtc
+1
-1
r01510.vtc
bin/varnishtest/tests/r01510.vtc
+1
-1
r01569.vtc
bin/varnishtest/tests/r01569.vtc
+1
-1
vcc_symb.c
lib/libvcc/vcc_symb.c
+3
-2
No files found.
bin/varnishtest/tests/c00005.vtc
View file @
b75d595d
...
...
@@ -9,7 +9,7 @@ server s1 {
txresp -body "2222\n"
} -start
varnish v1 -errvcl {
foo
} {
varnish v1 -errvcl {
Name acl1 must have type 'acl'.
} {
sub vcl_recv {
if (client.ip ~ acl1) {
set req.url = "/";
...
...
bin/varnishtest/tests/r01510.vtc
View file @
b75d595d
...
...
@@ -8,7 +8,7 @@ varnish v1 -errvcl {Instance 'first' redefined.} {
}
}
varnish v1 -errvcl {Name 'first' already
us
ed.} {
varnish v1 -errvcl {Name 'first' already
defin
ed.} {
import debug;
backend first { .host = "${bad_ip}"; .port = "9080"; }
...
...
bin/varnishtest/tests/r01569.vtc
View file @
b75d595d
varnishtest "symbol lookup order issue"
varnish v1 -errvcl {Name 'debug' already
us
ed.} {
varnish v1 -errvcl {Name 'debug' already
defin
ed.} {
vcl 4.0;
import debug;
...
...
lib/libvcc/vcc_symb.c
View file @
b75d595d
...
...
@@ -229,7 +229,7 @@ VCC_HandleSymbol(struct vcc *tl, const struct token *tk, vcc_type_t fmt,
vcc_ErrWhere
(
tl
,
sym
->
def_b
);
return
(
sym
);
}
else
if
(
sym
!=
NULL
&&
sym
->
def_b
!=
NULL
)
{
VSB_printf
(
tl
->
sb
,
"Name '%.*s' already
us
ed.
\n
"
,
PF
(
tk
));
VSB_printf
(
tl
->
sb
,
"Name '%.*s' already
defin
ed.
\n
"
,
PF
(
tk
));
vcc_ErrWhere
(
tl
,
tk
);
VSB_printf
(
tl
->
sb
,
"First definition:
\n
"
);
AN
(
sym
->
def_b
);
...
...
@@ -237,7 +237,8 @@ VCC_HandleSymbol(struct vcc *tl, const struct token *tk, vcc_type_t fmt,
return
(
sym
);
}
else
if
(
sym
!=
NULL
&&
sym
->
kind
!=
kind
)
{
VSB_printf
(
tl
->
sb
,
"Name %.*s is a reserved name.
\n
"
,
PF
(
tk
));
"Name %.*s must have type '%s'.
\n
"
,
PF
(
tk
),
VCC_SymKind
(
tl
,
sym
));
vcc_ErrWhere
(
tl
,
tk
);
return
(
sym
);
}
...
...
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