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
9849fd06
Commit
9849fd06
authored
Feb 03, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fall out of compiled VCL code if any statement sets ctx->handling non-zero.
Right now this only affects failures in vcl_init{}
parent
aedc4d68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
m00022.vtc
bin/varnishtest/tests/m00022.vtc
+14
-0
vcc_parse.c
lib/libvcc/vcc_parse.c
+1
-0
No files found.
bin/varnishtest/tests/m00022.vtc
View file @
9849fd06
...
@@ -7,19 +7,33 @@ server s1 {
...
@@ -7,19 +7,33 @@ server s1 {
varnish v1 -vcl+backend { } -start
varnish v1 -vcl+backend { } -start
logexpect l1 -v v1 -g raw {
expect * 0 VCL_Log "Should happen first"
expect 0 0 VCL_Log "Should happen second"
} -start
varnish v1 -errvcl "Planned failure in vcl_init" {
varnish v1 -errvcl "Planned failure in vcl_init" {
import debug;
import debug;
import std;
backend default {
backend default {
.host = "${s1_addr}";
.host = "${s1_addr}";
}
}
sub vcl_init {
sub vcl_init {
std.log("Should happen first");
debug.init_fail();
debug.init_fail();
std.log("Should not happen");
}
sub vcl_fini {
std.log("Should happen second");
}
}
}
}
logexpect l1 -wait
varnish v1 -cliok "param.set nuke_limit 42"
varnish v1 -cliok "param.set nuke_limit 42"
varnish v1 -errvcl "nuke_limit is not the answer." {
varnish v1 -errvcl "nuke_limit is not the answer." {
...
...
lib/libvcc/vcc_parse.c
View file @
9849fd06
...
@@ -196,6 +196,7 @@ vcc_Compound(struct vcc *tl)
...
@@ -196,6 +196,7 @@ vcc_Compound(struct vcc *tl)
vcc_ErrWhere
(
tl
,
tl
->
t
);
vcc_ErrWhere
(
tl
,
tl
->
t
);
return
;
return
;
}
}
Fb
(
tl
,
1
,
"if (*ctx->handling) return(1);
\n
"
);
}
}
}
}
...
...
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