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
1000b772
Commit
1000b772
authored
Nov 13, 2020
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
varnishncsa: -E implies -c
Otherwise the combination of -E and -b only outputs backend requests.
parent
656f7714
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+1
-1
varnishncsa_options.h
bin/varnishncsa/varnishncsa_options.h
+3
-3
e00003.vtc
bin/varnishtest/tests/e00003.vtc
+16
-1
No files found.
bin/varnishncsa/varnishncsa.c
View file @
1000b772
...
@@ -1157,7 +1157,7 @@ main(int argc, char * const *argv)
...
@@ -1157,7 +1157,7 @@ main(int argc, char * const *argv)
}
}
}
}
/* default is client mode: */
/* default is client mode: */
if
(
!
CTX
.
b_opt
)
if
(
!
CTX
.
b_opt
||
CTX
.
E_opt
)
CTX
.
c_opt
=
1
;
CTX
.
c_opt
=
1
;
if
(
optind
!=
argc
)
if
(
optind
!=
argc
)
...
...
bin/varnishncsa/varnishncsa_options.h
View file @
1000b772
...
@@ -75,8 +75,8 @@
...
@@ -75,8 +75,8 @@
" specified, then -c is needed to also log client requests" \
" specified, then -c is needed to also log client requests" \
)
)
#define NCSA_OPT_E \
#define NCSA_OPT_E \
VOPT("E", "[-E]", "Show ESI request", \
VOPT("E", "[-E]", "Show ESI request
s
", \
"Show ESI request
."
\
"Show ESI request
s, implies client mode."
\
)
)
NCSA_OPT_a
NCSA_OPT_a
...
...
bin/varnishtest/tests/e00003.vtc
View file @
1000b772
varnishtest "ESI include"
varnishtest "ESI include"
server s1 {
server s1 {
rxreq
rxreq
expect req.http.esi0 == "foo"
expect req.http.esi0 == "foo"
...
@@ -92,3 +91,19 @@ logexpect l2 -wait
...
@@ -92,3 +91,19 @@ logexpect l2 -wait
logexpect l3 -wait
logexpect l3 -wait
logexpect l4 -wait
logexpect l4 -wait
logexpect l5 -wait
logexpect l5 -wait
shell {
varnishncsa -n ${v1_name} -d -b -E \
-F '%{Varnish:vxid}x %{Varnish:side}x %{VSL:Begin[3]}x' |
sort > ncsa.txt
cat >expected.txt
<
<
-EOF
1001
c
rxreq
1002
b
fetch
1003
c
esi
1004
b
fetch
1005
c
rxreq
1006
c
esi
EOF
diff
-u
expected
.
txt
ncsa
.
txt
}
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