[master] f16e95f8e Make "default" a fully reserved word in syntax 4.0 also
Poul-Henning Kamp
phk at FreeBSD.org
Mon Apr 15 07:21:06 UTC 2019
commit f16e95f8ea9efb6459694608eaba6cd5f7f4b0ac
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Apr 15 07:20:25 2019 +0000
Make "default" a fully reserved word in syntax 4.0 also
Fixes #2959
diff --git a/lib/libvcc/vcc_parse.c b/lib/libvcc/vcc_parse.c
index faa929d5f..f47991748 100644
--- a/lib/libvcc/vcc_parse.c
+++ b/lib/libvcc/vcc_parse.c
@@ -357,7 +357,7 @@ static struct toplev {
{ "probe", vcc_ParseProbe, VCL_41, VCL_HIGH },
{ "import", vcc_ParseImport, VCL_41, VCL_HIGH },
{ "vcl", vcc_ParseVcl, VCL_41, VCL_HIGH },
- { "default", NULL, VCL_41, VCL_HIGH },
+ { "default", NULL, VCL_40, VCL_HIGH },
{ NULL, NULL }
};
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 67d4d8707..6ab7defe4 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -146,7 +146,7 @@ VCC_Symbol(struct vcc *tl, struct symbol *parent,
break;
if ((kind == SYM_NONE && kind == sym->kind))
continue;
- if (tl->syntax < VCL_41 &&
+ if (tl->syntax < VCL_41 && strcmp(sym->name, "default") &&
(kind != SYM_NONE && kind != sym->kind))
continue;
break;
More information about the varnish-commit
mailing list