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
c1f87801
Commit
c1f87801
authored
Jan 16, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "-x dumpbuiltin" to varnishd
parent
26c3d5bd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
builtin.vcl
bin/varnishd/builtin.vcl
+1
-11
mgt.h
bin/varnishd/mgt/mgt.h
+1
-0
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+2
-0
mgt_vcc.c
bin/varnishd/mgt/mgt_vcc.c
+6
-0
a00009.vtc
bin/varnishtest/tests/a00009.vtc
+1
-0
No files found.
bin/varnishd/builtin.vcl
View file @
c1f87801
...
@@ -26,17 +26,7 @@
...
@@ -26,17 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* SUCH DAMAGE.
*
*
* This is the builtin VCL code
*
* The built-in (previously called default) VCL code.
*
* NB! You do NOT need to copy
&
paste all of these functions into your
* own vcl code, if you do not provide a definition of one of these
* functions, the compiler will automatically fall back to the default
* code from this file.
*
* This code will be prefixed with a backend declaration built from the
* -b argument.
*/
*/
vcl 4.0;
vcl 4.0;
...
...
bin/varnishd/mgt/mgt.h
View file @
c1f87801
...
@@ -178,6 +178,7 @@ void STV_Config(const char *spec);
...
@@ -178,6 +178,7 @@ void STV_Config(const char *spec);
void
STV_Config_Transient
(
void
);
void
STV_Config_Transient
(
void
);
/* mgt_vcc.c */
/* mgt_vcc.c */
void
mgt_DumpBuiltin
(
void
);
char
*
mgt_VccCompile
(
struct
cli
*
,
struct
vclprog
*
,
const
char
*
vclname
,
char
*
mgt_VccCompile
(
struct
cli
*
,
struct
vclprog
*
,
const
char
*
vclname
,
const
char
*
vclsrc
,
const
char
*
vclsrcfile
,
int
C_flag
);
const
char
*
vclsrc
,
const
char
*
vclsrcfile
,
int
C_flag
);
...
...
bin/varnishd/mgt/mgt_main.c
View file @
c1f87801
...
@@ -340,6 +340,8 @@ mgt_x_arg(const char *x_arg)
...
@@ -340,6 +340,8 @@ mgt_x_arg(const char *x_arg)
mgt_DumpRstVsl
();
mgt_DumpRstVsl
();
else
if
(
!
strcmp
(
x_arg
,
"dumprstcli"
))
else
if
(
!
strcmp
(
x_arg
,
"dumprstcli"
))
mgt_DumpRstCli
();
mgt_DumpRstCli
();
else
if
(
!
strcmp
(
x_arg
,
"dumpbuiltin"
))
mgt_DumpBuiltin
();
else
else
ARGV_ERR
(
"Invalid -x argument
\n
"
);
ARGV_ERR
(
"Invalid -x argument
\n
"
);
}
}
...
...
bin/varnishd/mgt/mgt_vcc.c
View file @
c1f87801
...
@@ -76,6 +76,12 @@ static const char * const builtin_vcl =
...
@@ -76,6 +76,12 @@ static const char * const builtin_vcl =
#include "builtin_vcl.h"
#include "builtin_vcl.h"
""
;
""
;
void
mgt_DumpBuiltin
(
void
)
{
puts
(
builtin_vcl
);
}
/*--------------------------------------------------------------------
/*--------------------------------------------------------------------
* Invoke system VCC compiler in a sub-process
* Invoke system VCC compiler in a sub-process
*/
*/
...
...
bin/varnishtest/tests/a00009.vtc
View file @
c1f87801
...
@@ -4,6 +4,7 @@ shell "varnishd -b 127.0.0.1:80 -C 2> ${tmpdir}/_.c"
...
@@ -4,6 +4,7 @@ shell "varnishd -b 127.0.0.1:80 -C 2> ${tmpdir}/_.c"
shell "varnishd -x dumprstparam > ${tmpdir}/_.param"
shell "varnishd -x dumprstparam > ${tmpdir}/_.param"
shell "varnishd -x dumprstvsl > ${tmpdir}/_.vsl"
shell "varnishd -x dumprstvsl > ${tmpdir}/_.vsl"
shell "varnishd -x dumprstcli > ${tmpdir}/_.cli"
shell "varnishd -x dumprstcli > ${tmpdir}/_.cli"
shell "varnishd -x dumpbuiltin > ${tmpdir}/_.builtin"
shell -err -expect {VCL version declaration missing} {
shell -err -expect {VCL version declaration missing} {
echo 'bad vcl' > ${tmpdir}/t.vcl
echo 'bad vcl' > ${tmpdir}/t.vcl
varnishd -f ${tmpdir}/t.vcl -n ${tmpdir}
varnishd -f ${tmpdir}/t.vcl -n ${tmpdir}
...
...
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