r2714 - trunk/varnish-cache/bin/varnishtest
phk at projects.linpro.no
phk at projects.linpro.no
Tue Jun 17 09:30:21 CEST 2008
Author: phk
Date: 2008-06-17 09:30:16 +0200 (Tue, 17 Jun 2008)
New Revision: 2714
Modified:
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Add -vcl option varnish command, to load inline VCL code.
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-17 07:24:20 UTC (rev 2713)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-17 07:30:16 UTC (rev 2714)
@@ -250,11 +250,21 @@
v->vcl_nbr++;
vsb_printf(vsb, "vcl.inline vcl%d \"", v->vcl_nbr);
- for (; *vcl != '\0'; vcl++) {
- if (isgraph(*vcl) || *vcl == '\\' || *vcl == '"')
- vsb_putc(vsb, *vcl);
- else
- vsb_printf(vsb, "\\x%02x", *vcl);
+ for (vcl++; vcl[1] != '\0'; vcl++) {
+ switch (*vcl) {
+ case '\\':
+ case '"':
+ vsb_printf(vsb, "\\%c", *vcl); break;
+ case '\n':
+ vsb_printf(vsb, "\\n"); break;
+ case '\t':
+ vsb_printf(vsb, "\\t"); break;
+ default:
+ if (isgraph(*vcl) || *vcl == ' ')
+ vsb_putc(vsb, *vcl);
+ else
+ vsb_printf(vsb, "\\x%02x", *vcl);
+ }
}
vsb_printf(vsb, "\"", *vcl);
vsb_finish(vsb);
@@ -263,7 +273,7 @@
u = varnish_ask_cli(v, vsb_data(vsb), NULL);
assert(u == CLIS_OK);
vsb_clear(vsb);
- vsb_printf(vsb, "vcl.use vcl%d \"", v->vcl_nbr);
+ vsb_printf(vsb, "vcl.use vcl%d", v->vcl_nbr);
vsb_finish(vsb);
AZ(vsb_overflowed(vsb));
u = varnish_ask_cli(v, vsb_data(vsb), NULL);
More information about the varnish-commit
mailing list