[experimental-ims] 4633d00 Fix up default format string in man page and code comments

Geoff Simmons geoff at varnish-cache.org
Mon Jan 9 21:51:45 CET 2012

commit 4633d008fac58813b06bdc421dd31787851b6c50
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date:   Tue Sep 6 15:09:14 2011 +0200

    Fix up default format string in man page and code comments
    We're actually using %s, not %>s, since we don't support >.
    Thanks to Kai for patch
    Fixes: #999

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 70e915f..7c35c3e 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -31,7 +31,7 @@
  * Obtain log data from the shared memory log, order it by session ID, and
  * 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:
diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
index 65f08dd..a4bac0a 100644
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@ -52,7 +52,7 @@ The following options are available:
 -F format   Specify the log format used. If no format is specified the  
    	    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:

More information about the varnish-commit mailing list