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
d56069e8
Commit
d56069e8
authored
Sep 06, 2011
by
Andreas Plesner Jacobsen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
b09f55ec
4633d008
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+2
-2
varnishncsa.rst
doc/sphinx/reference/varnishncsa.rst
+1
-1
No files found.
bin/varnishncsa/varnishncsa.c
View file @
d56069e8
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
* Obtain log data from the shared memory log, order it by session ID, and
* Obtain log data from the shared memory log, order it by session ID, and
* display it in Apache / NCSA combined log format:
* display it in Apache / NCSA combined log format:
*
*
* %h %l %u %t "%r" %
>
s %b "%{Referer}i" "%{User-agent}i"
* %h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"
*
*
* where the fields are defined as follows:
* where the fields are defined as follows:
*
*
...
@@ -716,7 +716,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
...
@@ -716,7 +716,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
VSB_cat
(
os
,
(
lp
->
df_hitmiss
?
lp
->
df_hitmiss
:
"-"
));
VSB_cat
(
os
,
(
lp
->
df_hitmiss
?
lp
->
df_hitmiss
:
"-"
));
p
=
tmp
;
p
=
tmp
;
break
;
break
;
}
else
if
(
strcmp
(
fname
,
"handling"
)
==
0
)
{
}
else
if
(
strcmp
(
fname
,
"
Varnish:
handling"
)
==
0
)
{
VSB_cat
(
os
,
(
lp
->
df_handling
?
lp
->
df_handling
:
"-"
));
VSB_cat
(
os
,
(
lp
->
df_handling
?
lp
->
df_handling
:
"-"
));
p
=
tmp
;
p
=
tmp
;
break
;
break
;
...
...
doc/sphinx/reference/varnishncsa.rst
View file @
d56069e8
...
@@ -52,7 +52,7 @@ The following options are available:
...
@@ -52,7 +52,7 @@ The following options are available:
-F format Specify the log format used. If no format is specified the
-F format Specify the log format used. If no format is specified the
default log format is used. Currently it is:
default log format is used. Currently it is:
%h %l %u %t "%r" %
>
s %b "%{Referer}i" "%{User-agent}i"
%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"
Supported formatters are:
Supported formatters are:
...
...
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