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
e407f7c1
Commit
e407f7c1
authored
Feb 18, 2019
by
Nils Goroll
Committed by
Poul-Henning Kamp
May 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Don't panic if you try to relabel a VCL with the same label."
This reverts commit
4709fae3
.
parent
a280f82b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
11 deletions
+0
-11
mgt_vcl.c
bin/varnishd/mgt/mgt_vcl.c
+0
-7
c00077.vtc
bin/varnishtest/tests/c00077.vtc
+0
-4
No files found.
bin/varnishd/mgt/mgt_vcl.c
View file @
e407f7c1
...
...
@@ -923,13 +923,6 @@ mcf_vcl_label(struct cli *cli, const char * const *av, void *priv)
VCLI_Out
(
cli
,
"%s is not a label"
,
vpl
->
name
);
return
;
}
if
(
!
VTAILQ_EMPTY
(
&
vpl
->
dfrom
)
&&
VTAILQ_FIRST
(
&
vpl
->
dfrom
)
->
to
==
vpt
)
{
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
VCLI_Out
(
cli
,
"VCL '%s' already has label '%s'"
,
vpt
->
name
,
vpl
->
name
);
return
;
}
if
(
!
VTAILQ_EMPTY
(
&
vpt
->
dfrom
)
&&
!
VTAILQ_EMPTY
(
&
vpl
->
dto
))
{
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
...
...
bin/varnishtest/tests/c00077.vtc
View file @
e407f7c1
...
...
@@ -13,10 +13,6 @@ varnish v1 -vcl+backend {
varnish v1 -clierr 106 "vcl.label vcl.A vcl1"
varnish v1 -cliok "vcl.label vclA vcl1"
varnish v1 -clierr 106 "vcl.label vclA vcl1"
varnish v1 -cliexpect {VCL 'vcl1' already has label 'vclA'} {
vcl.label vclA vcl1
}
varnish v1 -vcl+backend {
sub vcl_recv {
...
...
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