r94952 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94951‎ | r94952 | r94953 >
Date:21:38, 18 August 2011
Author:asher
Status:deferred
Tags:
Comment:
varnishncsa -f (use xff ip's) option changed default log format, now more like wmf squidlogs
Modified paths:
  • /trunk/debs/varnish3/debian/changelog (modified) (history)
  • /trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch (modified) (history)

Diff [purge]

Index: trunk/debs/varnish3/debian/patches/01-varnishncsa-udp.dpatch
@@ -2,12 +2,12 @@
33 ## 01-varnishncsa-udp.dpatch by <root@ragweed.knams.wikimedia.org>
44 ##
55 ## All lines beginning with `## DP:' are a description of the patch.
6 -## DP: add udp multicast support, seq number
 6+## DP: multicast udp logging w/seq numbering
77
88 @DPATCH@
99
1010 --- varnish3-3.0.0~/bin/varnishncsa/varnishncsa.c 2011-08-09 23:55:17.000000000 +0000
11 -+++ varnish3-3.0.0/bin/varnishncsa/varnishncsa.c 2011-08-11 21:22:37.000000000 +0000
1211 @@ -79,6 +79,13 @@
1312 #include "varnishapi.h"
1413 #include "base64.h"
@@ -127,3 +127,12 @@
128128
129129 vd = VSM_New();
130130 VSL_Setup(vd);
 131+@@ -739,7 +794,7 @@
 132+ fprintf(stderr, "-f and -F can not be combined\n");
 133+ exit(1);
 134+ }
 135+- format = "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"";
 136++ format = "%{X-Forwarded-For}i %n %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"";
 137+ format_flag = 1;
 138+ break;
 139+ case 'F':
Index: trunk/debs/varnish3/debian/changelog
@@ -1,3 +1,9 @@
 2+varnish3 (3.0.0-1wmf4) lucid; urgency=low
 3+
 4+ * -f (xff ip's) option defaulted to ncsa log format, now like wmf squids
 5+
 6+ -- Asher Feldman <afledman@wikimedia.org> Thu, 18 Aug 2011 21:32:29 +0000
 7+
28 varnish3 (3.0.0-1wmf3) lucid; urgency=low
39
410 * Increase mcast ttl from 1 to 6
@@ -2,3 +8,3 @@
39
4 - -- Asher Feldman <afledman@wikimedia.org> Thu, 15 Aug 2011 20:32:29 +0000
 10+ -- Asher Feldman <afledman@wikimedia.org> Mon, 15 Aug 2011 20:32:29 +0000
511

Status & tagging log