From tfheen at projects.linpro.no  Wed Apr  1 11:04:44 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 13:04:44 +0200 (CEST)
Subject: r4014 - trunk/varnish-cache/lib/libvarnish
Message-ID: <20090401110444.2E44D1F7431@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 13:04:43 +0200 (Wed, 01 Apr 2009)
New Revision: 4014

Modified:
   trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Use $$(...) rather than $(shell ...) for non-GNU makes

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-03-31 07:44:56 UTC (rev 4013)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-04-01 11:04:43 UTC (rev 4014)
@@ -33,8 +33,8 @@
 
 DISTCLEANFILES = svn_version.c
 svn_version.c: FORCE
-	V="$(shell git log -n 1 --pretty=format:%h || svnversion -n $(top_srcdir))" \
-	H="$(shell head -n 1 svn_version.c || true)"; \
+	V="$$(git log -n 1 --pretty=format:%h || svnversion -n $(top_srcdir))" \
+	H="$$(head -n 1 svn_version.c || true)"; \
 	if [ "/* $$V */" != "$$H" ]; then \
 		( \
 		  echo "/* $$V */" ;\



From tfheen at projects.linpro.no  Wed Apr  1 12:21:48 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 14:21:48 +0200 (CEST)
Subject: r4015 - in branches/2.0/varnish-cache: bin/varnishd doc
Message-ID: <20090401122148.E78C91F7435@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 14:21:48 +0200 (Wed, 01 Apr 2009)
New Revision: 4015

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c
   branches/2.0/varnish-cache/bin/varnishd/varnishd.c
   branches/2.0/varnish-cache/doc/Makefile.am
Log:
Merge r3952,r3953: Unused variables


Modified: branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c	2009-04-01 12:21:48 UTC (rev 4015)
@@ -569,6 +569,8 @@
 const char*
 VRT_r_server_identity(struct sess *sp)
 {
+	(void)sp;
+
 	if (heritage.identity[0] != '\0')
 		return heritage.identity;
 	else 
@@ -579,6 +581,8 @@
 const char*
 VRT_r_server_hostname(struct sess *sp)
 {
+	(void)sp;
+
 	if (vrt_hostname[0] == '\0')
 		gethostname(vrt_hostname, 255);
 	

Modified: branches/2.0/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-04-01 12:21:48 UTC (rev 4015)
@@ -596,8 +596,8 @@
 
 
 	if (i_arg != NULL) {
-		size_t len;
-		if (snprintf(heritage.identity, sizeof heritage.identity, "%s", i_arg) > sizeof heritage.identity) {
+		if (snprintf(heritage.identity, sizeof heritage.identity,
+		    "%s", i_arg) > sizeof heritage.identity) {
 			fprintf(stderr, "Invalid identity name: %s\n",
 			    strerror(ENAMETOOLONG));
 			exit(1);

Modified: branches/2.0/varnish-cache/doc/Makefile.am
===================================================================
--- branches/2.0/varnish-cache/doc/Makefile.am	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/doc/Makefile.am	2009-04-01 12:21:48 UTC (rev 4015)
@@ -1,6 +1,7 @@
 # $Id$
 
 CHANGELOGS = \
+	changes-2.0.4.html \
 	changes-2.0.3.html \
 	changes-2.0.2.html \
 	changes-2.0.1.html \
@@ -11,6 +12,7 @@
 	changes-1.0.4.html
 
 XML = \
+	changes-2.0.3-2.0.4.xml \
 	changes-2.0.2-2.0.3.xml \
 	changes-2.0.1-2.0.2.xml \
 	changes-2.0-2.0.1.xml \



From tfheen at projects.linpro.no  Wed Apr  1 12:22:27 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 14:22:27 +0200 (CEST)
Subject: r4016 - branches/2.0/varnish-cache/doc
Message-ID: <20090401122227.BF1BC1F7434@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 14:22:27 +0200 (Wed, 01 Apr 2009)
New Revision: 4016

Added:
   branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml
   branches/2.0/varnish-cache/doc/changes-2.0.4.xml
Log:
Add 2.0.3->2.0.4 docs

Added: branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml
===================================================================
--- branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml	                        (rev 0)
+++ branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml	2009-04-01 12:22:27 UTC (rev 4016)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE group [
+<!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<group from="2.0.3" to="2.0.4">
+  <subsystem>
+    <name>varnishd</name>
+
+    <change type="enh">
+      <para>Make Varnish more portable by pulling in fixes for
+      Solaris and NetBSD.</para>
+    </change>
+
+    <change type="bug">
+      <para>Correct description of -a in the manual page.</para>
+    </change>
+
+    <change type="bug">
+      <para>Ensure we are compiling in C99 mode.</para>
+    </change>
+
+    <change type="bug" ref="458">
+      <para>If error was called with a null reason, we would crash on
+      Solaris.  Make sure this no longer happens.</para>
+    </change>
+
+    <change type="bug" ref="428">
+      <para>Varnish used to crash if you asked it to use a
+      non-existent waiter.  This has now been fixed.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add documentation to the default VCL explaining that
+      using <code>Connection: close</code> in <code>vcl_close</code>
+      is generally a good idea.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add minimal facility for dealing with TELNET option
+	negotiation by returning WONT to DO and DONT requests.</para>
+    </change>
+
+    <change type="enh">
+      <para>If the backend is unhealthy, use a graced object if one is
+      available.</para>
+    </change>
+
+    <change type="enh">
+      <para>Make <code>server.hostname</code>
+      and <code>server.identity</code> available to VCL.  The latter
+      can be set with the <code>-i</code> parameter
+      to <code>varnishd</code>.</para>
+    </change>
+
+    <change type="enh">
+      <para>Make <code>restart</code> available
+      from <code>vcl_error</code>.</para>
+    </change>
+
+    <change type="enh">
+      <para>Previously, only the TTL of an object was considered in
+      whether it would be marked as cacheable.  This has been changed
+      to take the grace into consideration as well.</para>
+    </change>
+
+    <change type="bug" ref="445">
+      <para>Previously, if an included ESI fragment had a zero size,
+      we would send out a zero-sized chunk which signifies
+      end-of-transmission.  We now ignore zero-sized chunks.</para>
+    </change>
+
+    <change type="bug">
+      <para>We accidentially slept for far too long when we reached
+      the maximum number of open file descriptors.  This has been
+      corrected and <code>accept_fd_holdoff</code> now works
+      correctly.</para>
+    </change>
+    <change type="bug" ref="476">
+      <para>Previously, when ESI processing, we did not look at the
+      full length, but stopped at the first NULL byte.  We no longer
+      do that, enabling ESI processing of binary data.</para>
+    </change>
+
+  <subsystem>
+    <name>varnishtest</name>
+    <change type="bug">
+      <para>Make sure system "..." returns successfully to ensure
+      test failures do not go unnoticed.</para>
+    </change>
+
+    <change type="enh">
+      <para>Make it possible to send NULL bytes through the testing
+      framework.</para>
+    </change>
+  </subsystem>
+</group>

Added: branches/2.0/varnish-cache/doc/changes-2.0.4.xml
===================================================================
--- branches/2.0/varnish-cache/doc/changes-2.0.4.xml	                        (rev 0)
+++ branches/2.0/varnish-cache/doc/changes-2.0.4.xml	2009-04-01 12:22:27 UTC (rev 4016)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xml" href="changes-html.xsl"?>
+<!DOCTYPE changelog [
+ <!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<changelog xmlns:xi="http://www.w3.org/2001/XInclude">
+  <package>Varnish</package>
+  <version>2.0.4</version>
+
+  <xi:include href="changes-2.0.3-2.0.4.xml"/>
+</changelog>



From tfheen at projects.linpro.no  Wed Apr  1 12:25:15 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 14:25:15 +0200 (CEST)
Subject: r4017 - branches/2.0/varnish-cache
Message-ID: <20090401122515.562611F76A5@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 14:25:15 +0200 (Wed, 01 Apr 2009)
New Revision: 4017

Modified:
   branches/2.0/varnish-cache/configure.ac
Log:
Bump version number to 2.0.4

Modified: branches/2.0/varnish-cache/configure.ac
===================================================================
--- branches/2.0/varnish-cache/configure.ac	2009-04-01 12:22:27 UTC (rev 4016)
+++ branches/2.0/varnish-cache/configure.ac	2009-04-01 12:25:15 UTC (rev 4017)
@@ -3,7 +3,7 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006-2008 Linpro AS / Verdens Gang AS])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [2.0.3], [varnish-dev at projects.linpro.no])
+AC_INIT([Varnish], [2.0.4], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(include/varnishapi.h)
 AM_CONFIG_HEADER(config.h)
 



From tfheen at projects.linpro.no  Wed Apr  1 12:50:29 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 14:50:29 +0200 (CEST)
Subject: r4018 - in branches/2.0/varnish-cache: bin/varnishtest/tests include
Message-ID: <20090401125029.794571F76BC@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 14:50:29 +0200 (Wed, 01 Apr 2009)
New Revision: 4018

Added:
   branches/2.0/varnish-cache/bin/varnishtest/tests/r00466.vtc
Modified:
   branches/2.0/varnish-cache/include/http_headers.h
Log:
Merge r3910: Don't pass range header to backend on miss.

Fixes ticket #466



Copied: branches/2.0/varnish-cache/bin/varnishtest/tests/r00466.vtc (from rev 3910, trunk/varnish-cache/bin/varnishtest/tests/r00466.vtc)
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/r00466.vtc	                        (rev 0)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/r00466.vtc	2009-04-01 12:50:29 UTC (rev 4018)
@@ -0,0 +1,40 @@
+# $Id$
+
+test "Check Range forwarding to backend"
+
+server s1 {
+	rxreq 
+	expect req.url == "/foo"
+	expect req.http.range == "req.http.range"
+	txresp \
+		-hdr "Foobar: _barf_" \
+		-body "012345\n"
+
+	rxreq 
+	expect req.url == "/bar"
+	expect req.http.range == "200-300"
+	txresp \
+		-status 206 \
+		-hdr "Foobar: _barf_" \
+		-body "012345\n"
+} -start
+
+varnish v1 -vcl+backend { 
+	sub vcl_recv {
+		if (req.url ~ "bar") {
+			pass;
+		}
+	}
+} -start -cliok "param.set diag_bitmap 0x10000"
+
+client c1 {
+	txreq -url "/foo" -hdr "Range: 100-200"
+	rxresp
+	expect resp.status == 200
+	expect resp.http.X-Varnish == "1001"
+
+	txreq -url "/bar" -hdr "Range: 200-300"
+	rxresp
+	expect resp.status == 206
+	expect resp.http.X-Varnish == "1002"
+} -run

Modified: branches/2.0/varnish-cache/include/http_headers.h
===================================================================
--- branches/2.0/varnish-cache/include/http_headers.h	2009-04-01 12:25:15 UTC (rev 4017)
+++ branches/2.0/varnish-cache/include/http_headers.h	2009-04-01 12:50:29 UTC (rev 4018)
@@ -86,7 +86,7 @@
 HTTPH("Pragma",			H_Pragma,		1, 0, 0,										0, 0)	/* RFC2616 14.32 */
 HTTPH("Proxy-Authenticate",	H_Proxy_Authenticate,	2, 3, 				    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.33 */
 HTTPH("Proxy-Authorization",	H_Proxy_Authorization,	1, 3, 				    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.34 */
-HTTPH("Range",			H_Range,		1, 0, 0,										0, 0)	/* RFC2616 14.35 */
+HTTPH("Range",			H_Range,		1, 0,                  		    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.35 */
 HTTPH("Referer",		H_Referer,		1, 0, 0,										0, 0)	/* RFC2616 14.36 */
 HTTPH("Retry-After",		H_Retry_After,		2, 0, 0,										0, 0)	/* RFC2616 14.37 */
 HTTPH("Server",			H_Server,		2, 0, 0,										0, 0)	/* RFC2616 14.38 */



From tfheen at projects.linpro.no  Wed Apr  1 13:35:03 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  1 Apr 2009 15:35:03 +0200 (CEST)
Subject: r4019 - branches/2.0/varnish-cache/doc
Message-ID: <20090401133503.949981F7434@projects.linpro.no>

Author: tfheen
Date: 2009-04-01 15:35:03 +0200 (Wed, 01 Apr 2009)
New Revision: 4019

Modified:
   branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml
Log:
Fix typo in xml file

Modified: branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml
===================================================================
--- branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml	2009-04-01 12:50:29 UTC (rev 4018)
+++ branches/2.0/varnish-cache/doc/changes-2.0.3-2.0.4.xml	2009-04-01 13:35:03 UTC (rev 4019)
@@ -81,6 +81,7 @@
       full length, but stopped at the first NULL byte.  We no longer
       do that, enabling ESI processing of binary data.</para>
     </change>
+  </subsystem>
 
   <subsystem>
     <name>varnishtest</name>



From des at projects.linpro.no  Wed Apr  1 14:10:29 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Wed,  1 Apr 2009 16:10:29 +0200 (CEST)
Subject: r4020 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090401141029.7F3771F76BD@projects.linpro.no>

Author: des
Date: 2009-04-01 16:10:29 +0200 (Wed, 01 Apr 2009)
New Revision: 4020

Modified:
   trunk/varnish-cache/bin/varnishd/stevedore_utils.c
Log:
Whitespace cleanup


Modified: trunk/varnish-cache/bin/varnishd/stevedore_utils.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-01 13:35:03 UTC (rev 4019)
+++ trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-01 14:10:29 UTC (rev 4020)
@@ -45,7 +45,7 @@
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
 #endif
-                
+
 #ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #endif
@@ -85,7 +85,7 @@
 	char *q;
 	int retval = 1;
 
-	AN(fn);	
+	AN(fn);
 	AN(fnp);
 	AN(fdp);
 	*fnp = NULL;



From tfheen at projects.linpro.no  Thu Apr  2 09:24:43 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Thu,  2 Apr 2009 11:24:43 +0200 (CEST)
Subject: r4021 - tags
Message-ID: <20090402092443.C85A21F76A3@projects.linpro.no>

Author: tfheen
Date: 2009-04-02 11:24:43 +0200 (Thu, 02 Apr 2009)
New Revision: 4021

Added:
   tags/varnish-2.0.4/
Log:
2.0.4 is released


Copied: tags/varnish-2.0.4 (from rev 4020, branches/2.0)



From des at projects.linpro.no  Thu Apr  2 12:09:16 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Thu,  2 Apr 2009 14:09:16 +0200 (CEST)
Subject: r4022 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090402120916.0D2281F76C5@projects.linpro.no>

Author: des
Date: 2009-04-02 14:09:15 +0200 (Thu, 02 Apr 2009)
New Revision: 4022

Modified:
   trunk/varnish-cache/bin/varnishd/stevedore_utils.c
Log:
In struct statvfs, f_bsize is not the block size (i.e. the granularity
of f_bavail), but the recommended I/O granularity.  The field we want
is f_frsize.  This should probably be abstracted away in libvarnish.


Modified: trunk/varnish-cache/bin/varnishd/stevedore_utils.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-02 09:24:43 UTC (rev 4021)
+++ trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-02 12:09:15 UTC (rev 4022)
@@ -140,23 +140,28 @@
 static uintmax_t
 stv_fsspace(int fd, unsigned *bs)
 {
+	uintmax_t bsize, bavail;
 #if defined(HAVE_SYS_STATVFS_H)
 	struct statvfs fsst;
 
 	AZ(fstatvfs(fd, &fsst));
+	bsize = fsst.f_frsize;
+	bavail = fsst.f_bavail;
 #elif defined(HAVE_SYS_MOUNT_H) || defined(HAVE_SYS_VFS_H)
 	struct statfs fsst;
 
 	AZ(fstatfs(sc->fd, &fsst));
+	bsize = fsst.f_bsize;
+	bavail = fsst.f_bavail;
 #else
 #error no struct statfs / struct statvfs
 #endif
 
 	/* We use units of the larger of filesystem blocksize and pagesize */
-	if (*bs < fsst.f_bsize)
-		*bs = fsst.f_bsize;
-	xxxassert(*bs % fsst.f_bsize == 0);
-	return (fsst.f_bsize * fsst.f_bavail);
+	if (*bs < bsize)
+		*bs = bsize;
+	xxxassert(*bs % bsize == 0);
+	return (bsize * bavail);
 }
 
 



From des at projects.linpro.no  Fri Apr  3 21:34:49 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Fri,  3 Apr 2009 23:34:49 +0200 (CEST)
Subject: r4023 - trunk/varnish-cache
Message-ID: <20090403213449.3FAA21F76CA@projects.linpro.no>

Author: des
Date: 2009-04-03 23:34:48 +0200 (Fri, 03 Apr 2009)
New Revision: 4023

Modified:
   trunk/varnish-cache/configure.ac
Log:
Fix copyright.


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2009-04-02 12:09:15 UTC (rev 4022)
+++ trunk/varnish-cache/configure.ac	2009-04-03 21:34:48 UTC (rev 4023)
@@ -1,7 +1,8 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2006-2008 Linpro AS / Verdens Gang AS])
+AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
+Copyright (c) 2009-2009 Linpro AS])
 AC_REVISION([$Id$])
 AC_INIT([Varnish], [trunk], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(include/varnishapi.h)



From des at projects.linpro.no  Fri Apr  3 21:41:57 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Fri,  3 Apr 2009 23:41:57 +0200 (CEST)
Subject: r4024 - trunk/varnish-cache
Message-ID: <20090403214157.B93C21F76C8@projects.linpro.no>

Author: des
Date: 2009-04-03 23:41:57 +0200 (Fri, 03 Apr 2009)
New Revision: 4024

Modified:
   trunk/varnish-cache/configure.ac
Log:
<sys/mount.h> requires <sys/param.h>; thanks to Olivier Nicole.


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2009-04-03 21:34:48 UTC (rev 4023)
+++ trunk/varnish-cache/configure.ac	2009-04-03 21:41:57 UTC (rev 4024)
@@ -75,9 +75,11 @@
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
+AC_CHECK_HEADERS([sys/param.h])
+AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([sys/endian.h])
 AC_CHECK_HEADERS([sys/filio.h])
-AC_CHECK_HEADERS([sys/mount.h])
+AC_CHECK_HEADERS([sys/mount.h], [], [], [#include <sys/param.h>])
 AC_CHECK_HEADERS([sys/socket.h])
 AC_CHECK_HEADERS([sys/statvfs.h])
 AC_CHECK_HEADERS([sys/vfs.h])



From des at projects.linpro.no  Fri Apr  3 21:52:45 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Fri,  3 Apr 2009 23:52:45 +0200 (CEST)
Subject: r4025 - in trunk/varnish-cache: . bin/varnishadm bin/varnishd
	bin/varnishhist bin/varnishlog bin/varnishncsa
	bin/varnishreplay bin/varnishstat bin/varnishtop include
	include/compat lib/libvarnish lib/libvarnishapi
	lib/libvarnishcompat lib/libvcl man
Message-ID: <20090403215245.691841F76D7@projects.linpro.no>

Author: des
Date: 2009-04-03 23:52:44 +0200 (Fri, 03 Apr 2009)
New Revision: 4025

Modified:
   trunk/varnish-cache/LICENSE
   trunk/varnish-cache/bin/varnishadm/varnishadm.1
   trunk/varnish-cache/bin/varnishadm/varnishadm.c
   trunk/varnish-cache/bin/varnishd/acct_fields.h
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/cache_backend.h
   trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c
   trunk/varnish-cache/bin/varnishd/cache_backend_poll.c
   trunk/varnish-cache/bin/varnishd/cache_backend_poll.h
   trunk/varnish-cache/bin/varnishd/cache_cli.c
   trunk/varnish-cache/bin/varnishd/cache_dir_random.c
   trunk/varnish-cache/bin/varnishd/cache_dir_round_robin.c
   trunk/varnish-cache/bin/varnishd/cache_dir_simple.c
   trunk/varnish-cache/bin/varnishd/cache_esi.c
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/bin/varnishd/cache_httpconn.c
   trunk/varnish-cache/bin/varnishd/cache_lck.c
   trunk/varnish-cache/bin/varnishd/cache_main.c
   trunk/varnish-cache/bin/varnishd/cache_panic.c
   trunk/varnish-cache/bin/varnishd/cache_pipe.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
   trunk/varnish-cache/bin/varnishd/cache_response.c
   trunk/varnish-cache/bin/varnishd/cache_session.c
   trunk/varnish-cache/bin/varnishd/cache_vary.c
   trunk/varnish-cache/bin/varnishd/cache_vcl.c
   trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
   trunk/varnish-cache/bin/varnishd/cache_waiter.h
   trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c
   trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
   trunk/varnish-cache/bin/varnishd/cache_ws.c
   trunk/varnish-cache/bin/varnishd/common.h
   trunk/varnish-cache/bin/varnishd/hash_classic.c
   trunk/varnish-cache/bin/varnishd/hash_critbit.c
   trunk/varnish-cache/bin/varnishd/hash_simple_list.c
   trunk/varnish-cache/bin/varnishd/hash_slinger.h
   trunk/varnish-cache/bin/varnishd/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt.h
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.h
   trunk/varnish-cache/bin/varnishd/mgt_param.c
   trunk/varnish-cache/bin/varnishd/mgt_pool.c
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
   trunk/varnish-cache/bin/varnishd/shmlog.c
   trunk/varnish-cache/bin/varnishd/steps.h
   trunk/varnish-cache/bin/varnishd/stevedore.c
   trunk/varnish-cache/bin/varnishd/stevedore.h
   trunk/varnish-cache/bin/varnishd/stevedore_utils.c
   trunk/varnish-cache/bin/varnishd/storage_file.c
   trunk/varnish-cache/bin/varnishd/storage_malloc.c
   trunk/varnish-cache/bin/varnishd/storage_synth.c
   trunk/varnish-cache/bin/varnishd/storage_umem.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
   trunk/varnish-cache/bin/varnishd/vparam.h
   trunk/varnish-cache/bin/varnishhist/varnishhist.1
   trunk/varnish-cache/bin/varnishhist/varnishhist.c
   trunk/varnish-cache/bin/varnishlog/varnishlog.1
   trunk/varnish-cache/bin/varnishlog/varnishlog.c
   trunk/varnish-cache/bin/varnishncsa/varnishncsa.1
   trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
   trunk/varnish-cache/bin/varnishreplay/varnishreplay.1
   trunk/varnish-cache/bin/varnishstat/varnishstat.1
   trunk/varnish-cache/bin/varnishstat/varnishstat.c
   trunk/varnish-cache/bin/varnishtop/varnishtop.1
   trunk/varnish-cache/bin/varnishtop/varnishtop.c
   trunk/varnish-cache/include/binary_heap.h
   trunk/varnish-cache/include/cli.h
   trunk/varnish-cache/include/cli_common.h
   trunk/varnish-cache/include/cli_priv.h
   trunk/varnish-cache/include/compat/asprintf.h
   trunk/varnish-cache/include/compat/daemon.h
   trunk/varnish-cache/include/compat/setproctitle.h
   trunk/varnish-cache/include/compat/srandomdev.h
   trunk/varnish-cache/include/compat/strlcat.h
   trunk/varnish-cache/include/compat/strlcpy.h
   trunk/varnish-cache/include/compat/strndup.h
   trunk/varnish-cache/include/compat/vasprintf.h
   trunk/varnish-cache/include/http_headers.h
   trunk/varnish-cache/include/http_response.h
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/include/libvcl.h
   trunk/varnish-cache/include/purge_vars.h
   trunk/varnish-cache/include/shmlog.h
   trunk/varnish-cache/include/shmlog_tags.h
   trunk/varnish-cache/include/stat_field.h
   trunk/varnish-cache/include/stats.h
   trunk/varnish-cache/include/varnishapi.h
   trunk/varnish-cache/include/vbm.h
   trunk/varnish-cache/include/vct.h
   trunk/varnish-cache/include/vev.h
   trunk/varnish-cache/include/vrt.h
   trunk/varnish-cache/include/vss.h
   trunk/varnish-cache/lib/libvarnish/argv.c
   trunk/varnish-cache/lib/libvarnish/assert.c
   trunk/varnish-cache/lib/libvarnish/binary_heap.c
   trunk/varnish-cache/lib/libvarnish/cli.c
   trunk/varnish-cache/lib/libvarnish/cli_common.c
   trunk/varnish-cache/lib/libvarnish/inxorcise.c
   trunk/varnish-cache/lib/libvarnish/num.c
   trunk/varnish-cache/lib/libvarnish/subproc.c
   trunk/varnish-cache/lib/libvarnish/tcp.c
   trunk/varnish-cache/lib/libvarnish/time.c
   trunk/varnish-cache/lib/libvarnish/vct.c
   trunk/varnish-cache/lib/libvarnish/version.c
   trunk/varnish-cache/lib/libvarnish/vev.c
   trunk/varnish-cache/lib/libvarnish/vss.c
   trunk/varnish-cache/lib/libvarnish/vtmpfile.c
   trunk/varnish-cache/lib/libvarnishapi/instance.c
   trunk/varnish-cache/lib/libvarnishapi/shmlog.c
   trunk/varnish-cache/lib/libvarnishcompat/asprintf.c
   trunk/varnish-cache/lib/libvarnishcompat/setproctitle.c
   trunk/varnish-cache/lib/libvarnishcompat/srandomdev.c
   trunk/varnish-cache/lib/libvarnishcompat/strndup.c
   trunk/varnish-cache/lib/libvarnishcompat/vasprintf.c
   trunk/varnish-cache/lib/libvcl/vcc_acl.c
   trunk/varnish-cache/lib/libvcl/vcc_action.c
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
   trunk/varnish-cache/lib/libvcl/vcc_compile.c
   trunk/varnish-cache/lib/libvcl/vcc_compile.h
   trunk/varnish-cache/lib/libvcl/vcc_dir_random.c
   trunk/varnish-cache/lib/libvcl/vcc_dir_round_robin.c
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_parse.c
   trunk/varnish-cache/lib/libvcl/vcc_priv.h
   trunk/varnish-cache/lib/libvcl/vcc_string.c
   trunk/varnish-cache/lib/libvcl/vcc_token.c
   trunk/varnish-cache/lib/libvcl/vcc_var.c
   trunk/varnish-cache/lib/libvcl/vcc_xref.c
   trunk/varnish-cache/man/vcl.7so
Log:
Update Linpro copyright (about 3 months late).  Someone should
probably s/Linpro/Redpill Linpro/ at some point.


Modified: trunk/varnish-cache/LICENSE
===================================================================
--- trunk/varnish-cache/LICENSE	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/LICENSE	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2008 Linpro AS
+Copyright (c) 2006-2009 Linpro AS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-cache/bin/varnishadm/varnishadm.1
===================================================================
--- trunk/varnish-cache/bin/varnishadm/varnishadm.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishadm/varnishadm.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: trunk/varnish-cache/bin/varnishadm/varnishadm.c
===================================================================
--- trunk/varnish-cache/bin/varnishadm/varnishadm.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishadm/varnishadm.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: trunk/varnish-cache/bin/varnishd/acct_fields.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/acct_fields.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/acct_fields.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2008 Verdens Gang AS
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_backend_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_backend_poll.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_poll.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_poll.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_dir_random.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_dir_random.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_dir_random.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_dir_round_robin.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_dir_round_robin.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_dir_round_robin.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Petter Knudsen <petter at linpro.no>

Modified: trunk/varnish-cache/bin/varnishd/cache_dir_simple.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_dir_simple.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_dir_simple.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_httpconn.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_httpconn.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_httpconn.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_lck.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_lck.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_lck.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_main.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_main.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_panic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_panic.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_panic.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_vary.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vary.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_vary.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_vcl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vcl.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_vcl.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_epoll.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_kqueue.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/cache_ws.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ws.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/cache_ws.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/common.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/common.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/common.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/hash_critbit.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/hash_simple_list.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_simple_list.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/hash_simple_list.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_pool.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_pool.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/steps.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/steps.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/steps.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2008 Linpro AS
+ * Copyright (c) 2007-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishd/stevedore.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/stevedore.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/stevedore_utils.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/stevedore_utils.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/storage_malloc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_malloc.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/storage_malloc.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/storage_synth.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_synth.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/storage_synth.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/storage_umem.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_umem.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/storage_umem.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishd/vparam.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/vparam.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishd/vparam.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishhist/varnishhist.1
===================================================================
--- trunk/varnish-cache/bin/varnishhist/varnishhist.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishhist/varnishhist.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishhist/varnishhist.c
===================================================================
--- trunk/varnish-cache/bin/varnishhist/varnishhist.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishhist/varnishhist.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.1
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.1
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Anders Berg <andersb at vgnett.no>

Modified: trunk/varnish-cache/bin/varnishreplay/varnishreplay.1
===================================================================
--- trunk/varnish-cache/bin/varnishreplay/varnishreplay.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishreplay/varnishreplay.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007-2008 Linpro AS
+.\" Copyright (c) 2007-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.1
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.1
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.1	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.1	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/binary_heap.h
===================================================================
--- trunk/varnish-cache/include/binary_heap.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/binary_heap.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/cli.h
===================================================================
--- trunk/varnish-cache/include/cli.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/cli.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/cli_common.h
===================================================================
--- trunk/varnish-cache/include/cli_common.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/cli_common.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/cli_priv.h
===================================================================
--- trunk/varnish-cache/include/cli_priv.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/cli_priv.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/compat/asprintf.h
===================================================================
--- trunk/varnish-cache/include/compat/asprintf.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/asprintf.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/daemon.h
===================================================================
--- trunk/varnish-cache/include/compat/daemon.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/daemon.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/setproctitle.h
===================================================================
--- trunk/varnish-cache/include/compat/setproctitle.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/setproctitle.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/srandomdev.h
===================================================================
--- trunk/varnish-cache/include/compat/srandomdev.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/srandomdev.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/strlcat.h
===================================================================
--- trunk/varnish-cache/include/compat/strlcat.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/strlcat.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/strlcpy.h
===================================================================
--- trunk/varnish-cache/include/compat/strlcpy.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/strlcpy.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/strndup.h
===================================================================
--- trunk/varnish-cache/include/compat/strndup.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/strndup.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/compat/vasprintf.h
===================================================================
--- trunk/varnish-cache/include/compat/vasprintf.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/compat/vasprintf.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/include/http_headers.h
===================================================================
--- trunk/varnish-cache/include/http_headers.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/http_headers.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/http_response.h
===================================================================
--- trunk/varnish-cache/include/http_response.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/http_response.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/libvarnish.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/libvcl.h
===================================================================
--- trunk/varnish-cache/include/libvcl.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/libvcl.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/purge_vars.h
===================================================================
--- trunk/varnish-cache/include/purge_vars.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/purge_vars.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/shmlog.h
===================================================================
--- trunk/varnish-cache/include/shmlog.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/shmlog.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/shmlog_tags.h
===================================================================
--- trunk/varnish-cache/include/shmlog_tags.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/shmlog_tags.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/stat_field.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/stats.h
===================================================================
--- trunk/varnish-cache/include/stats.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/stats.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/varnishapi.h
===================================================================
--- trunk/varnish-cache/include/varnishapi.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/varnishapi.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/vbm.h
===================================================================
--- trunk/varnish-cache/include/vbm.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/vbm.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/vct.h
===================================================================
--- trunk/varnish-cache/include/vct.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/vct.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/vev.h
===================================================================
--- trunk/varnish-cache/include/vev.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/vev.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/vrt.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/include/vss.h
===================================================================
--- trunk/varnish-cache/include/vss.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/include/vss.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-cache/lib/libvarnish/argv.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/argv.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/argv.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/assert.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/assert.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/assert.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/binary_heap.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/binary_heap.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/binary_heap.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/cli.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/cli.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/inxorcise.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/inxorcise.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/inxorcise.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/num.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/num.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/num.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/subproc.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/subproc.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/subproc.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/tcp.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/tcp.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/tcp.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/time.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/time.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/time.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/vct.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vct.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/vct.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/version.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/version.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/version.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnish/vev.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vev.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/vev.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnish/vss.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vss.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/vss.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnish/vtmpfile.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vtmpfile.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnish/vtmpfile.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishapi/instance.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/instance.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishapi/instance.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2008 Linpro AS
+ * Copyright (c) 2007-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishapi/shmlog.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/shmlog.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishapi/shmlog.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvarnishcompat/asprintf.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/asprintf.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishcompat/asprintf.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishcompat/setproctitle.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/setproctitle.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishcompat/setproctitle.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishcompat/srandomdev.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/srandomdev.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishcompat/srandomdev.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishcompat/strndup.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/strndup.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishcompat/strndup.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvarnishcompat/vasprintf.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/vasprintf.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvarnishcompat/vasprintf.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_acl.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_acl.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.h
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_dir_random.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_dir_random.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_dir_random.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_dir_round_robin.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_dir_round_robin.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_dir_round_robin.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2008 Linpro AS
+ * Copyright (c) 2008-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Petter Knudsen <petter at linpro.no>

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -205,7 +205,7 @@
 	/* ../../include/vrt.h */
 
 	vsb_cat(sb, "/*-\n * Copyright (c) 2006 Verdens Gang AS\n");
-	vsb_cat(sb, " * Copyright (c) 2006-2008 Linpro AS\n");
+	vsb_cat(sb, " * Copyright (c) 2006-2009 Linpro AS\n");
 	vsb_cat(sb, " * All rights reserved.\n *\n * Author: Poul-Henning K");
 	vsb_cat(sb, "amp <phk at phk.freebsd.dk>\n *\n * Redistribution and us");
 	vsb_cat(sb, "e in source and binary forms, with or without\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_parse.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_parse.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_priv.h
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_priv.h	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_priv.h	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_string.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_string.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_string.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_token.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_token.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_var.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_var.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_var.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/lib/libvcl/vcc_xref.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_xref.c	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/lib/libvcl/vcc_xref.c	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2008 Linpro AS
+ * Copyright (c) 2006-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>

Modified: trunk/varnish-cache/man/vcl.7so
===================================================================
--- trunk/varnish-cache/man/vcl.7so	2009-04-03 21:41:57 UTC (rev 4024)
+++ trunk/varnish-cache/man/vcl.7so	2009-04-03 21:52:44 UTC (rev 4025)
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2006 Verdens Gang AS
-.\" Copyright (c) 2006-2008 Linpro AS
+.\" Copyright (c) 2006-2009 Linpro AS
 .\" All rights reserved.
 .\"
 .\" Author: Dag-Erling Sm?rgrav <des at des.no>



From des at projects.linpro.no  Fri Apr  3 21:54:26 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Fri,  3 Apr 2009 23:54:26 +0200 (CEST)
Subject: r4026 - in trunk/varnish-tools: autobuild emacs fetcher munin nagios
	regress/bin regress/lib/Varnish regress/lib/Varnish/Test
	regress/lib/Varnish/Test/Case regress/lib/Varnish/Test/Report
	regress/lib/Varnish/Test/Server
Message-ID: <20090403215426.0FF8C28396@projects.linpro.no>

Author: des
Date: 2009-04-03 23:54:25 +0200 (Fri, 03 Apr 2009)
New Revision: 4026

Modified:
   trunk/varnish-tools/autobuild/autobuild.sh
   trunk/varnish-tools/autobuild/mksummary.pl
   trunk/varnish-tools/emacs/vcl-mode.el
   trunk/varnish-tools/fetcher/fetcher.pl
   trunk/varnish-tools/munin/configure.ac
   trunk/varnish-tools/munin/varnish_munin_plugin.pl
   trunk/varnish-tools/nagios/LICENSE
   trunk/varnish-tools/nagios/check_varnish.c
   trunk/varnish-tools/nagios/configure.ac
   trunk/varnish-tools/regress/bin/varnish-regress.pl
   trunk/varnish-tools/regress/lib/Varnish/Test.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/LRU.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/POST.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Pipeline.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/RePurge.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket128.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket164.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Vary.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Report.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Report/HTML.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Server/Connection.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
Log:
Update copyright here as well.


Modified: trunk/varnish-tools/autobuild/autobuild.sh
===================================================================
--- trunk/varnish-tools/autobuild/autobuild.sh	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/autobuild/autobuild.sh	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/autobuild/mksummary.pl
===================================================================
--- trunk/varnish-tools/autobuild/mksummary.pl	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/autobuild/mksummary.pl	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/emacs/vcl-mode.el
===================================================================
--- trunk/varnish-tools/emacs/vcl-mode.el	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/emacs/vcl-mode.el	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 ;;; vcl-mode.el - Syntax highlighting for Varnish Command Language
 ;;; 
-;;; Copyright (c) 2008 Linpro AS
+;;; Copyright (c) 2008-2009 Linpro AS
 ;;; All rights reserved.
 ;;;
 ;;; Author: Stig Sandbeck Mathisen <ssm at linpro.no>

Modified: trunk/varnish-tools/fetcher/fetcher.pl
===================================================================
--- trunk/varnish-tools/fetcher/fetcher.pl	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/fetcher/fetcher.pl	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-tools/munin/configure.ac
===================================================================
--- trunk/varnish-tools/munin/configure.ac	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/munin/configure.ac	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2007-2008 Linpro AS / Verdens Gang AS])
+AC_COPYRIGHT([Copyright (c) 2007-2009 Linpro AS / Verdens Gang AS])
 AC_REVISION([$Id$])
 AC_INIT([Varnish Munin plugin], [trunk], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(varnish_munin_plugin.pl)

Modified: trunk/varnish-tools/munin/varnish_munin_plugin.pl
===================================================================
--- trunk/varnish-tools/munin/varnish_munin_plugin.pl	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/munin/varnish_munin_plugin.pl	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Author: Dag-Erling Sm?rgrav <des at des.no>

Modified: trunk/varnish-tools/nagios/LICENSE
===================================================================
--- trunk/varnish-tools/nagios/LICENSE	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/nagios/LICENSE	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2008 Linpro AS
+Copyright (c) 2007-2009 Linpro AS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/nagios/check_varnish.c
===================================================================
--- trunk/varnish-tools/nagios/check_varnish.c	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/nagios/check_varnish.c	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2008 Linpro AS
+ * Copyright (c) 2007-2009 Linpro AS
  * All rights reserved.
  *
  * Author: Cecilie Fritzvold <cecilihf at linpro.no>

Modified: trunk/varnish-tools/nagios/configure.ac
===================================================================
--- trunk/varnish-tools/nagios/configure.ac	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/nagios/configure.ac	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,7 +1,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2007-2008 Linpro AS])
+AC_COPYRIGHT([Copyright (c) 2007-2009 Linpro AS])
 AC_REVISION([$Id$])
 AC_INIT([nagios-varnish-plugin], [1.0], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(check_varnish.c)

Modified: trunk/varnish-tools/regress/bin/varnish-regress.pl
===================================================================
--- trunk/varnish-tools/regress/bin/varnish-regress.pl	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/bin/varnish-regress.pl	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/LRU.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/LRU.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/LRU.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/POST.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/POST.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/POST.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Pipeline.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Pipeline.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Pipeline.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/RePurge.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/RePurge.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/RePurge.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket128.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket128.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket128.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket164.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket164.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket164.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Vary.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Vary.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Vary.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Report/HTML.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Report/HTML.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Report/HTML.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Report.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Report.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Report.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2007-2008 Linpro AS
+# Copyright (c) 2007-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Server/Connection.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Server/Connection.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Server/Connection.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

Modified: trunk/varnish-tools/regress/lib/Varnish/Test.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test.pm	2009-04-03 21:52:44 UTC (rev 4025)
+++ trunk/varnish-tools/regress/lib/Varnish/Test.pm	2009-04-03 21:54:25 UTC (rev 4026)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #-
-# Copyright (c) 2006-2008 Linpro AS
+# Copyright (c) 2006-2009 Linpro AS
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without



From des at projects.linpro.no  Fri Apr  3 22:00:01 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Sat,  4 Apr 2009 00:00:01 +0200 (CEST)
Subject: r4027 - in trunk/varnish-cache: bin/varnishd lib/libjemalloc
Message-ID: <20090403220001.0C2CA1F76C7@projects.linpro.no>

Author: des
Date: 2009-04-04 00:00:00 +0200 (Sat, 04 Apr 2009)
New Revision: 4027

Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
   trunk/varnish-cache/lib/libjemalloc/malloc.c
Log:
Unused includes.


Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 22:00:00 UTC (rev 4027)
@@ -88,14 +88,14 @@
 	@JEMALLOC_LDADD@ \
 	${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
 
-EXTRA_DIST = default.vcl
+dist_varnishconf_DATA = default.vcl
 DISTCLEANFILES = default_vcl.h
 
 #
 # Turn the default.vcl file into a C-string we can include in the program.
 #
 default_vcl.h:	default.vcl Makefile
-	sed -e 's/"/\\"/g' -e 's/$$/\\n"/' -e 's/^/ "/' $(srcdir)/default.vcl > $@
+	sed -e 's/"/\\"/g; s/$$/\\n"/; s/^/ "/' $(srcdir)/default.vcl > $@
 
 # Explicitly record dependency
-mgt_vcc.c:	default_vcl.h
+mgt_vcc.c: default_vcl.h

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "shmlog.h"
 #include "vct.h"

Modified: trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -193,7 +193,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <pthread.h>

Modified: trunk/varnish-cache/lib/libjemalloc/malloc.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/malloc.c	2009-04-03 21:54:25 UTC (rev 4026)
+++ trunk/varnish-cache/lib/libjemalloc/malloc.c	2009-04-03 22:00:00 UTC (rev 4027)
@@ -186,7 +186,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 
 #include "un-namespace.h"



From des at projects.linpro.no  Fri Apr  3 22:00:34 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Sat,  4 Apr 2009 00:00:34 +0200 (CEST)
Subject: r4028 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090403220034.EFE0528396@projects.linpro.no>

Author: des
Date: 2009-04-04 00:00:34 +0200 (Sat, 04 Apr 2009)
New Revision: 4028

Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
Log:
Committed by mistake.


Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 22:00:00 UTC (rev 4027)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2009-04-03 22:00:34 UTC (rev 4028)
@@ -88,14 +88,14 @@
 	@JEMALLOC_LDADD@ \
 	${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
 
-dist_varnishconf_DATA = default.vcl
+EXTRA_DIST = default.vcl
 DISTCLEANFILES = default_vcl.h
 
 #
 # Turn the default.vcl file into a C-string we can include in the program.
 #
 default_vcl.h:	default.vcl Makefile
-	sed -e 's/"/\\"/g; s/$$/\\n"/; s/^/ "/' $(srcdir)/default.vcl > $@
+	sed -e 's/"/\\"/g' -e 's/$$/\\n"/' -e 's/^/ "/' $(srcdir)/default.vcl > $@
 
 # Explicitly record dependency
-mgt_vcc.c: default_vcl.h
+mgt_vcc.c:	default_vcl.h



From des at projects.linpro.no  Fri Apr  3 22:02:08 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Sat,  4 Apr 2009 00:02:08 +0200 (CEST)
Subject: r4029 - trunk/varnish-cache/lib/libjemalloc
Message-ID: <20090403220208.A3DC21F76D1@projects.linpro.no>

Author: des
Date: 2009-04-04 00:02:08 +0200 (Sat, 04 Apr 2009)
New Revision: 4029

Modified:
   trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
Log:
Fix style & translate to English


Modified: trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 22:00:34 UTC (rev 4028)
+++ trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-04-03 22:02:08 UTC (rev 4029)
@@ -199,9 +199,11 @@
 
 #include "rb.h"
 
-/* Prevent -Werror to complain about unused parameters when compiling
-   with non-ancient GCC.  Added directly here instead of grabbed from
-   ansidecl.h to save a build dependency on binutils-dev */
+/*
+ * Prevent gcc from complaining about unused parameters.  Added directly
+ * here instead of including ansidecl.h to save a build dependency on
+ * binutils-dev.
+ */
 #if __GNUC__ >= 3
 #ifndef ATTRIBUTE_UNUSED
 #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))



From tfheen at projects.linpro.no  Mon Apr  6 12:39:13 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Mon,  6 Apr 2009 14:39:13 +0200 (CEST)
Subject: r4030 - in trunk/varnish-cache: . bin/varnishd
Message-ID: <20090406123913.DD9631F76DB@projects.linpro.no>

Author: tfheen
Date: 2009-04-06 14:39:13 +0200 (Mon, 06 Apr 2009)
New Revision: 4030

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/configure.ac
Log:
Make HTTP_HDR_MAX_VAL a configure option

Thanks to "whocares" in the bts.

Fixes #455

Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2009-04-03 22:02:08 UTC (rev 4029)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2009-04-06 12:39:13 UTC (rev 4030)
@@ -58,8 +58,6 @@
 #include "heritage.h"
 #include "miniobj.h"
 
-#define HTTP_HDR_MAX_VAL 32
-
 enum {
 	/* Fields from the first line of HTTP proto */
 	HTTP_HDR_REQ,

Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2009-04-03 22:02:08 UTC (rev 4029)
+++ trunk/varnish-cache/configure.ac	2009-04-06 12:39:13 UTC (rev 4030)
@@ -363,6 +363,15 @@
 fi
 AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
 
+# Define HTTP_HDR_MAX_VAL
+AC_ARG_WITH(max-header-fields,
+            AS_HELP_STRING([--with-max-header-fields=NUM],
+                           [How many header fields to support (default=32)]),
+            [],
+            [with_max_header_fields=32])
+
+AC_DEFINE_UNQUOTED(HTTP_HDR_MAX_VAL, $with_max_header_fields, [Define maximum number of header fields supported by varnish ])
+
 # Use jemalloc on Linux
 JEMALLOC_SUBDIR=
 JEMALLOC_LDADD=



From des at projects.linpro.no  Sun Apr 12 17:13:06 2009
From: des at projects.linpro.no (des at projects.linpro.no)
Date: Sun, 12 Apr 2009 19:13:06 +0200 (CEST)
Subject: r4031 - trunk/varnish-tools/fetcher
Message-ID: <20090412171306.0713D1F7B19@projects.linpro.no>

Author: des
Date: 2009-04-12 19:13:05 +0200 (Sun, 12 Apr 2009)
New Revision: 4031

Modified:
   trunk/varnish-tools/fetcher/fetcher.pl
Log:
Add support for saving retrieved documents to disk.


Modified: trunk/varnish-tools/fetcher/fetcher.pl
===================================================================
--- trunk/varnish-tools/fetcher/fetcher.pl	2009-04-06 12:39:13 UTC (rev 4030)
+++ trunk/varnish-tools/fetcher/fetcher.pl	2009-04-12 17:13:05 UTC (rev 4031)
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 #-
 # Copyright (c) 2007-2009 Linpro AS
+# Copyright (c) 2009 Dag-Erling Co?dan Sm?rgrav
 # All rights reserved.
 #
 # Author: Dag-Erling Sm?rgrav <des at des.no>
@@ -35,6 +36,8 @@
 package Varnish::Fetcher;
 
 use strict;
+use File::Basename;
+use File::Path;
 use Getopt::Long qw(:config bundling require_order auto_version);
 use IO::Handle;
 use IO::Multiplex;
@@ -43,7 +46,7 @@
 use Time::HiRes qw(gettimeofday tv_interval);
 use URI;
 
-our %URLS;
+our %URI;
 our %BANNED;
 our @TODO;
 our %CHILD;
@@ -55,6 +58,7 @@
 our $jobs = 1;
 our $quiet = 0;
 our $random = 0;
+our $save = 0;
 
 our $url_re = qr{
     \b(?:href|src)=[\'\"]\s*
@@ -71,9 +75,22 @@
 	'mux' => $mux,
 	'fh' => $fh,
 	'url' => undef,
+	'uri' => undef,
     };
 }
 
+sub info(@) {
+
+    print(STDOUT "[$$] ", join(' ', @_), "\n")
+	unless ($quiet);
+}
+
+sub error(@) {
+
+    print(STDERR "[$$] ", join(' ', @_), "\n")
+	unless ($quiet);
+}
+
 # Child
 sub run($$) {
     my ($self, $s) = @_;
@@ -97,8 +114,7 @@
 	    next;
 	}
 	$0 = "[fetcher] requesting $url";
-	print(STDERR "Retrieving $url\n")
-	    unless ($quiet > 1);
+	info("Retrieving $url");
 	my $resp = $ua->get($url);
 	if ($check) {
 	    $0 = "[fetcher] checking $url";
@@ -106,19 +122,39 @@
 		$s->write("ban $url\n");
 		$url = $resp->header('Location') ||
 		    $resp->header('Content-Location');
+		info("Redirected to $url");
 		$s->write("add $url\n")
 		    if $url;
 	    } elsif ($resp->is_success()) {
 		if ($resp->header('Content-Type') =~ m/^text\//) {
-		    my %urls = map { $_ => 1 } ($resp->content =~ m/$url_re/g);
+		    my %urls = map({ $_ => 1 } ($resp->content =~ m/$url_re/g));
 		    foreach (keys(%urls)) {
 			$s->write("add $_\n");
 		    }
 		}
+		if ($save && $url !~ m/\/$/) {
+		    my $uri = URI->new($url);
+		    my $path = "." . $uri->path;
+		    my $dir = dirname($path);
+		    eval {
+			mkpath($dir);
+			if (open(my $fh, ">", $path)) {
+			    info("Saving $url to $path");
+			    print($fh $resp->content);
+			    close($fh);
+			} else {
+			    die("open($path): $!\n");
+			}
+		    };
+		    if ($@) {
+			print(STDERR $@);
+		    }
+		}
 	    } elsif ($resp->is_error()) {
-		# XXX should we ban these?
+		error("Failed to retrieve $url");
+		$s->write("ban $url\n");
 	    } else {
-		print(STDERR "Unsupported response type:",
+		error("Unsupported response type:",
 		    $resp->status_line(), "\n");
 	    }
 	}
@@ -148,6 +184,7 @@
 	unless (@TODO);
     my $url = shift(@TODO);
     $$child{'url'} = $url;
+    $$child{'uri'} = $URI{$url};
     $$child{'fh'}->write("$url\n");
     ++$BUSY;
 }
@@ -161,7 +198,7 @@
     my $uri = URI->new_abs($1, $$child{'url'});
     $url = $uri->canonical;
     $BANNED{$url} = 1;
-    delete $URLS{$url};
+    delete $URI{$url};
     print(STDERR "Banned $url\n")
 	unless ($quiet > 2);
 }
@@ -174,15 +211,23 @@
 	unless $$child{'url'};
     my $uri = URI->new_abs($1, $$child{'url'});
     $url = $uri->canonical;
-    # XXX should cache child URI to avoid new() here
-    if ($BANNED{$url} || $uri->scheme() ne 'http' ||
-	$uri->host_port() ne URI->new($$child{'url'})->host_port()) {
-	print(STDERR "Rejected $url\n")
-	    unless ($quiet > 0);
+    if ($BANNED{$url}) {
+	info("Rejected (banned): $url");
 	return;
     }
-    return if $URLS{$url};
-    $URLS{$url} = 1;
+    if ($uri->scheme() ne 'http') {
+	info("Rejected (not HTTP): $url");
+	return;
+    }
+    if ($uri->host_port() ne $$child{'uri'}->host_port()) {
+	info("Rejected (other server): $url");
+    }
+    if (index($url, $$child{'url'}) != 0) {
+	info("Rejected (upstream): $url");
+	return;
+    }
+    return if $URI{$url};
+    $URI{$url} = $uri;
     push(@TODO, $url);
 }
 
@@ -197,6 +242,7 @@
 	my $line = $1;
 	if ($line eq "ready") {
 	    $$child{'url'} = '';
+	    $$child{'uri'} = undef;
 	    --$BUSY;
 	    ++$DONE;
 	    $mux->endloop();
@@ -250,7 +296,10 @@
 
     # prepare work queue
     foreach my $url (@urls) {
-	push(@TODO, URI->new($url)->canonical);
+	my $uri = URI->new($url);
+	$url = $uri->canonical;
+	$URI{$url} = $uri;
+	push(@TODO, $url);
     }
 
     $DONE = 0;
@@ -260,7 +309,7 @@
 		unless $$child{'url'};
 	}
 	printf(STDERR " %d/%d \r",
-	       int(keys(%URLS)) - @TODO, int(keys(%URLS)))
+	       int(keys(%URI)) - @TODO, int(keys(%URI)))
 	    unless ($quiet > 3);
 	last unless $BUSY;
 	$mux->loop();
@@ -279,7 +328,7 @@
 sub fetch_random() {
 
     my $t0 = [gettimeofday()];
-    my @urls = keys(%URLS);
+    my @urls = keys(%URI);
     @TODO = @urls;
     $DONE = 0;
 
@@ -304,7 +353,7 @@
 
     my $t0 = [gettimeofday()];
     for (;;) {
-	@TODO = keys(%URLS);
+	@TODO = keys(%URI);
 	$DONE = 0;
 
 	while (@TODO) {
@@ -312,13 +361,13 @@
 		$child->send_url()
 		    unless $$child{'url'};
 	    }
-	    printf(STDERR " %d/%d \r", $DONE, int(keys(%URLS)))
+	    printf(STDERR " %d/%d \r", $DONE, int(keys(%URI)))
 		unless ($quiet > 3);
 	    last unless $BUSY;
 	    $mux->loop();
 	}
 	my $t1 = [gettimeofday()];
-	summarize(int(keys(%URLS)), $t0, $t1);
+	summarize(int(keys(%URI)), $t0, $t1);
 	$t0 = $t1;
     }
 }
@@ -331,7 +380,7 @@
     my $t0 = [gettimeofday()];
     harvest(@urls);
     my $t1 = [gettimeofday()];
-    summarize(int(keys(%URLS)), $t0, $t1);
+    summarize(int(keys(%URI)), $t0, $t1);
 
     foreach my $child (values(%CHILD)) {
 	$child->send("no check");
@@ -357,7 +406,8 @@
 	       "d|delay=i" => \$delay,
 	       "j|jobs=i" => \$jobs,
 	       "q|quiet+" => \$quiet,
-	       "r|random!" => \$random)
+	       "r|random!" => \$random,
+	       "s|save-files!" => \$save)
 	or usage();
     $jobs > 0
 	or usage();



From sky at projects.linpro.no  Mon Apr 13 20:34:04 2009
From: sky at projects.linpro.no (sky at projects.linpro.no)
Date: Mon, 13 Apr 2009 22:34:04 +0200 (CEST)
Subject: r4032 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090413203404.0737C1F7720@projects.linpro.no>

Author: sky
Date: 2009-04-13 22:34:03 +0200 (Mon, 13 Apr 2009)
New Revision: 4032

Modified:
   trunk/varnish-cache/bin/varnishd/storage_file.c
Log:
Tell the kernel that we expect to use this memory randomly -- affects how it reads up to page cache. On linux I saw a 10-20x decrease in IO from reading the disk

Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2009-04-12 17:13:05 UTC (rev 4031)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2009-04-13 20:34:03 UTC (rev 4032)
@@ -417,6 +417,7 @@
 		p = mmap(NULL, sz, PROT_READ|PROT_WRITE,
 		    MAP_NOCORE | MAP_NOSYNC | MAP_SHARED, sc->fd, off);
 		if (p != MAP_FAILED) {
+			(void) madvise(p, sz, MADV_RANDOM);
 			(*sum) += sz;
 			new_smf(sc, p, off, sz);
 			return;



From kristian at projects.linpro.no  Tue Apr 14 10:27:43 2009
From: kristian at projects.linpro.no (kristian at projects.linpro.no)
Date: Tue, 14 Apr 2009 12:27:43 +0200 (CEST)
Subject: r4033 - trunk/varnish-tools/munin
Message-ID: <20090414102743.383671F76C0@projects.linpro.no>

Author: kristian
Date: 2009-04-14 12:27:42 +0200 (Tue, 14 Apr 2009)
New Revision: 4033

Added:
   trunk/varnish-tools/munin/varnish_
Removed:
   trunk/varnish-tools/munin/Makefile.am
   trunk/varnish-tools/munin/autogen.sh
   trunk/varnish-tools/munin/configure.ac
   trunk/varnish-tools/munin/varnish_munin_plugin.pl
Log:
Replace old munin-plugin with new and shiny

Deleted: trunk/varnish-tools/munin/Makefile.am
===================================================================
--- trunk/varnish-tools/munin/Makefile.am	2009-04-13 20:34:03 UTC (rev 4032)
+++ trunk/varnish-tools/munin/Makefile.am	2009-04-14 10:27:42 UTC (rev 4033)
@@ -1,10 +0,0 @@
-# $Id$
-
-EXTRA_DIST = varnish_munin_plugin.pl
-
-install-exec-local:
-	${install_sh} -m 0755 -c varnish_munin_plugin.pl \
-		${DESTDIR}${bindir}/varnish_
-#	for aspect in `${DESTDIR}${bindir}/varnish_ aspects` ; do \
-#		ln -fs varnish_ ${DESTDIR}${bindir}/varnish_$$aspect ; \
-#	done

Deleted: trunk/varnish-tools/munin/autogen.sh
===================================================================
--- trunk/varnish-tools/munin/autogen.sh	2009-04-13 20:34:03 UTC (rev 4032)
+++ trunk/varnish-tools/munin/autogen.sh	2009-04-14 10:27:42 UTC (rev 4033)
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-if [ -d /usr/local/gnu-autotools/bin ] ; then
-	PATH=/usr/local/gnu-autotools/bin:${PATH}
-	export PATH
-	FIX_BROKEN_FREEBSD_PORTS="-I /usr/local/share/aclocal"
-fi
-
-automake_version=$(automake --version | tr ' ' '\n' | egrep '^[0-9]\.[0-9a-z.-]+')
-if [ -z "$automake_version" ] ; then
-    echo "unable to determine automake version"
-    exit 1
-else
-    case $automake_version in
-	0.*|1.[0-8]|1.[0-8][.-]*)
-	    echo "your version of automake ($automake_version) is too old;" \
-		"you need 1.9 or newer."
-	    exit 1
-	    ;;
-	*)
-	    ;;
-    esac
-fi
-
-set -ex
-
-aclocal ${FIX_BROKEN_FREEBSD_PORTS}
-automake --add-missing --copy --foreign
-autoconf

Deleted: trunk/varnish-tools/munin/configure.ac
===================================================================
--- trunk/varnish-tools/munin/configure.ac	2009-04-13 20:34:03 UTC (rev 4032)
+++ trunk/varnish-tools/munin/configure.ac	2009-04-14 10:27:42 UTC (rev 4033)
@@ -1,19 +0,0 @@
-# $Id$
-
-AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2007-2009 Linpro AS / Verdens Gang AS])
-AC_REVISION([$Id$])
-AC_INIT([Varnish Munin plugin], [trunk], [varnish-dev at projects.linpro.no])
-AC_CONFIG_SRCDIR(varnish_munin_plugin.pl)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE
-
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_CHECK_PROGS(PERL, [perl])
-AC_CHECK_PROGS(VARNISHSTAT, [varnishstat])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

Added: trunk/varnish-tools/munin/varnish_
===================================================================
--- trunk/varnish-tools/munin/varnish_	                        (rev 0)
+++ trunk/varnish-tools/munin/varnish_	2009-04-14 10:27:42 UTC (rev 4033)
@@ -0,0 +1,806 @@
+#!/usr/bin/perl -w
+#
+# varnish_ - Munin plugin to for Varnish
+# Copyright (C) 2009  Redpill Linpro AS
+#
+# Author: Kristian Lyngst?l <kristian at redpill-linpro.com>
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+##########
+# Parameteres: 
+#	
+#	config (required)
+#	autoconf (optional - used by munin-conf)
+#	suggest (optional - used by munin-conf to determine valid symlinks)
+#
+# A few aspects are not linked by default. They are marked as 
+# 'DEBUG' => 'yes' (or any other value). They are:
+#
+# data_structures, vcl_and_purges, lru, objects_per_objhead,
+# obj_sendfile_vs_write, losthdr, esi, hcb, shm, shm_writes, overflow,
+# session, session_herd
+#
+# You can link them yourself with something like this:
+# ln -s /foo/varnish_ /etc/munin/plugins/varnish_data_structures
+#
+# Magic markers: Optional but should be included.
+#%# family=auto
+#%# capabilities=autoconf suggest
+
+use strict;
+
+# Set to 1 to enable output when a variable is defined in a graph but
+# omitted because it doesn't exist in varnishstat.
+my $DEBUG = 0;
+
+# Set to 1 to ignore 'DEBUG' and suggest all available aspects.
+my $FULL_SUGGEST = 0;
+
+# Varnishstat executable. Include full path if it's not in your path.
+my $varnishstat = "varnishstat";
+
+my %varnishstat = ();
+my %varnishstatnames = ();
+my $self; # Haha, myself, what a clever pun.
+
+# Parameters that can be defined on top level of a graph. Config will print
+# them as "graph_$foo $value\n"
+my @graph_parameters = ('title','total','order','scale','vlabel','args');
+
+# Parameters that can be defined on a value-to-value basis and will be
+# blindly passed to config. Printed as "$fieldname.$param $value\n".
+#
+# 'label' is hardcoded as it defaults to a varnishstat-description if not
+# set.
+my @field_parameters = ('graph', 'min', 'max', 'draw', 'cdef', 'warning',
+			'colour', 'info', 'type');
+
+# Data structure that defines all possible graphs (aspects) and how they
+# are to be plotted. Every top-level entry is a graph/aspect. Each top-level graph
+# MUST have title set and 'values'. 
+# 
+# The 'values' hash must have at least one value definition. The actual
+# value used is either fetched from varnishstat based on the value-name, or
+# if 'rpn' is defined: calculated. 'type' SHOULD be set. 
+#
+# Graphs with 'DEBUG' set to anything is omitted from 'suggest'.
+# 
+# 'rpn' on values allows easy access to graphs consisting of multiple
+# values from varnishstat. (Reverse polish notation). The RPN
+# implementation only accepts +-*/ and varnishstat-values.
+#
+# With the exception of 'label', which is filled with the
+# varnishstat-description if left undefined, any value left undefined will
+# be left up to Munin to define/ignore/yell about.
+#
+# See munin documentation or rrdgraph/rrdtool for more information.
+my %ASPECTS = ( 
+	'request_rate' => {
+		'title' => 'Request rates',
+		'order' => 'cache_hit cache_hitpass cache_miss '
+			 . 'backend_conn backend_unhealthy '
+			 . 'client_req client_conn' ,
+		'values' => {
+			'client_conn' => { 
+				'type' => 'DERIVE',
+				'min' => '0',
+				'colour' => '444444',
+				'graph' => 'ON'
+			},
+			'client_req' => {
+				'type' => 'DERIVE',
+				'colour' => '111111',
+				'min' => '0'
+			},
+			'cache_hit' => {
+				'type' => 'DERIVE',
+				'draw' => 'AREA',
+				'colour' => '00FF00',
+				'min' => '0'
+			},
+			'cache_hitpass' => {
+				'info' => 'Hitpass are cached passes: An '
+					. 'entry in the cache instructing '
+					. 'Varnish to pass. Typically '
+					. 'achieved after a pass in '
+					. 'vcl_fetch.',
+				'type' => 'DERIVE',
+				'draw' => 'STACK',
+				'colour' => 'FFFF00',
+				'min' => '0'
+			},
+			'cache_miss' => {
+				'type' => 'DERIVE',
+				'colour' => 'FF0000',
+				'draw' => 'STACK',
+				'min' => '0'
+			},
+			'backend_conn' => {
+				'type' => 'DERIVE',
+				'colour' => '995599',
+				'min' => '0'
+			},
+			'backend_unhealthy' => {
+				'colour' => 'FF55FF',
+				'type' => 'GAUGE'
+			},
+			's_pipe' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'colour' => '1d2bdf'
+			},
+			's_pass' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'colour' => '785d0d'
+			}
+		}
+	},
+	'hit_rate' => {
+		'title' => 'Hit rates',
+		'order' => 'client_req cache_hit cache_miss '
+			 . 'cache_hitpass' ,
+		'vlabel' => '%',
+		'args' => '-u 100 --rigid',
+		'scale' => 'no',
+		'values' => {
+			'client_req' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'graph' => 'off'
+			},
+			'cache_hit' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'draw' => 'AREA',
+				'cdef' => 'cache_hit,client_req,/,100,*'
+			},
+			'cache_miss' => {
+				'type' => 'DERIVE',
+				'draw' => 'STACK',
+				'min' => '0',
+				'cdef' => 'cache_miss,client_req,/,100,*'
+			},
+			'cache_hitpass' => {
+				'type' => 'DERIVE',
+				'draw' => 'STACK',
+				'min' => '0',
+				'cdef' => 'cache_hitpass,client_req,/,100,*'
+			},
+		}
+	},
+	'backend_traffic' => {
+		'title' => 'Backend traffic',
+		'values' => {
+			'backend_conn' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'backend_unhealthy' => {
+				'type' => 'GAUGE',
+				'min' => '0',
+				'warning' => ':1'
+			},
+			'backend_busy' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'backend_fail' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'backend_reuse' => {
+				'type' => 'DERIVE',
+				'min' => 0
+			},
+			'backend_recycle' => {
+				'type' => 'DERIVE',
+				'min' => 0
+			},
+			'backend_unused' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'backend_req' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'objects' => {
+		'title' => 'Number of objects',
+		'values' => {
+			'n_object' => {
+				'type' => 'GAUGE',
+				'label' => 'Number of objects'
+			},
+			'n_objecthead' => {
+				'type' => 'GAUGE',
+				'label' => 'Number of object heads',
+				'info' => 'Each object head can have one '
+					. 'or more ojbect attached, '
+					. 'typically based on the Vary: header'
+			}
+		}
+	},
+	'transfer_rates' => {
+		'title' => 'Transfer rates',
+		'order' => 's_bodybytes s_hdrbytes',
+		'args' => '-l 0',
+		'vlabel' => 'bit/s',
+		'values' => {
+			's_hdrbytes' => {
+				'type' => 'DERIVE',
+				'label' => 'Header traffic',
+				'draw' => 'STACK',
+				'min' => '0',
+				'info' => 'HTTP Header traffic. TCP/IP '
+					. 'overhead is not included.',
+				'cdef' => 's_hdrbytes,8,*'
+			},
+			's_bodybytes' => {
+				'type' => 'DERIVE',
+				'draw' => 'AREA',
+				'label' => 'Body traffic',
+				'min' => '0',
+				'cdef' => 's_bodybytes,8,*'
+			}
+		}
+	},
+	'threads' => {
+		'title' => 'Thread status',
+		'values' => { 
+			'n_wrk' => {
+				'type' => 'GAUGE',
+				'min' => '0',
+				'warning' => '1:'
+			},
+			'n_wrk_create' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_wrk_failed' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'warning' => ':1'
+			},
+			'n_wrk_max' => { 
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_wrk_overflow' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_wrk_drop' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+				'warning' => ':1'
+			}
+		}
+	},
+	'memory_usage' => {
+		'title' => 'Memory usage',
+		'order' => 'sm_balloc sma_nbytes sms_nbytes',
+		'total' => 'Total',
+		'args' => '--base 1024',
+		'values' => {
+			'sm_balloc' => {
+				'type' => 'GAUGE',
+				'draw' => 'AREA'
+			},
+			'sma_nbytes' => {
+				'type' => 'GAUGE',
+				'draw' => 'STACK'
+			},
+			'sms_nbytes' => {
+				'type' => 'GAUGE',
+				'draw' => 'STACK'
+			}
+		}
+	},
+	'uptime' => {
+		'title' => 'Varnish uptime',
+		'vlabel' => 'days',
+		'scale' => 'no',
+		'values' => {
+			'uptime' => {
+				'type' => 'GAUGE',
+				'cdef' => 'uptime,86400,/'
+			}
+		}
+	},
+	'objects_per_objhead' => {
+		'title' => 'Objects per objecthead',
+		'DEBUG' => 'yes',
+		'values' => {
+			'obj_per_objhead' => {
+				'type' => 'GAUGE',
+				'label' => 'Objects per object heads',
+				'rpn' => [ 'n_object','n_objecthead','/' ]
+			}
+		}
+	},
+	'losthdr' => {
+		'title' => 'HTTP Header overflows',
+		'DEBUG' => 'yes',
+		'values' => {
+			'losthdr' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'obj_sendfile_vs_write' => {
+		'title' => 'Objects delivered with sendfile() versus '
+			 . 'write()',
+		'DEBUG' => 'yes',
+		'values' => {
+			'n_objsendfile' => {
+				'type' => 'DERIVE',
+				'min' => '0',
+			},
+			'n_objwrite' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'hcb' => {
+		'title' => 'Critbit data',
+		'DEBUG' => 'yes',
+		'values' => {
+			'hcb_nolock' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'hcb_lock' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'hcb_insert' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'esi' => {
+		'title' => 'ESI',
+		'DEBUG' => 'yes',
+		'values' => {
+			'esi_parse' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'esi_errors' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'objoverflow' => {
+		'title' => 'Objects overflowing workspace',
+		'DEBUG' => 'yes',
+		'values' => {
+			'n_objoverflow' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'session' => {
+		'title' => 'Sessions',
+		'DEBUG' => 'yes',
+		'values' => {
+			'sess_closed' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'sess_pipeline' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'sess_readahead' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'sess_linger' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'session_herd' => {
+		'title' => 'Session herd',
+		'DEBUG' => 'yes',
+		'values' => {
+			'sess_herd' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'shm_writes' => {
+		'title' => 'SHM writes and records',
+		'DEBUG' => 'yes',
+		'values' => {
+			'shm_records' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'shm_writes' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'shm' => {
+		'title' => 'Shared memory activity',
+		'DEBUG' => 'yes',
+		'values' => {
+			'shm_flushes' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'shm_cont' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'shm_cycles' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'allocations' => {
+		'title' => 'Memory allocation requests',
+		'DEBUG' => 'yes',
+		'values' => {
+			'sm_nreq' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'sma_nreq' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'sms_nreq' => { 
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'vcl_and_purges' => {
+		'title' => 'VCL and purges',
+		'DEBUG' => 'yes',
+		'values' => {
+			'n_backend' => {
+				'type' => 'GAUGE'
+			},
+			'n_vcl' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_vcl_avail' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_vcl_discard' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_purge' => {
+				'type' => 'GAUGE'
+			},
+			'n_purge_add' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_purge_retire' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_purge_obj_test' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_purge_re_test' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_purge_dups' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'expunge' => {
+		'title' => 'Object expunging',
+		'values' => {
+			'n_expired' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_lru_nuked' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'lru' => {
+		'title' => 'LRU activity',
+		'DEBUG' => 'yes',
+		'values' => {
+			'n_lru_saved' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			},
+			'n_lru_moved' => {
+				'type' => 'DERIVE',
+				'min' => '0'
+			}
+		}
+	},
+	'data_structures' => {
+		'DEBUG' => 'YES',
+		'title' => 'Data structure sizes',
+		'values' => {
+			'n_srcaddr' => {
+				'type' => 'GAUGE'
+			},
+			'n_srcaddr_act' => {
+				'type' => 'GAUGE'
+			},
+			'n_sess_mem' => {
+				'type' => 'GAUGE'
+			},
+			'n_sess' => {
+				'type' => 'GAUGE'
+			},
+			'n_smf' => {
+				'type' => 'GAUGE'
+			},
+			'n_smf_frag' => {
+				'type' => 'GAUGE'
+			},
+			'n_smf_large' => {
+				'type' => 'GAUGE'
+			},
+			'n_vbe_conn' => {
+				'type' => 'GAUGE'
+			},
+			'n_bereq' => {
+				'type' => 'GAUGE'
+			}
+		}
+	}
+);
+
+# Populate %varnishstat with values and %varnishstatnames with
+# descriptions.
+sub populate_stats
+{
+	foreach my $line (`$varnishstat -1`) {
+		chomp($line);
+		if ($line =~ /^([^ ]*)\s+(\d+)\s+(\d*\.\d*)\s+(.*)$/) {
+			$varnishstat{"$1"} = $2;
+			$varnishstatnames{"$1"} = $4;
+		}
+	}
+}
+
+# Bail-function.
+sub usage
+{
+	if (defined(@_) && "@_" ne "") {
+		print STDERR "@_" . "\n\n";
+	}
+	print STDERR "Known arguments: suggest, config, autoconf.\n";
+	print STDERR "Run with suggest to get a list of known aspects.\n";
+	exit 1;
+}
+
+# Print 'yes' and exit true if it's reasonable to use this plugin.
+# Otherwise exit with false and a human-readable reason.
+sub autoconf
+{
+	if (`which $varnishstat` eq '') {
+		print "no (which $varnishstat returns blank)\n";
+		exit 1;
+	}
+	print "yes\n";
+	exit 0;
+}
+
+# Suggest relevant aspects/values of $self. 
+# 'DEBUG'-graphs are excluded.
+sub suggest
+{
+	foreach my $key (keys %ASPECTS) {
+		if (defined($ASPECTS{$key}{'DEBUG'}) && $FULL_SUGGEST != 1) {
+			next;
+		}
+		print "$key\n";
+	}
+}
+
+# Print the value of a two-dimensional hash if it exist.
+# Returns false if non-existant.
+#
+# Output is formatted for plugins if arg4 is blank, otherwise arg4 is used
+# as the title/name of the field (ie: arg4=graph_titel).
+sub print_if_exist
+{
+	my %values = %{$_[0]};
+	my $value = $_[1];
+	my $field = $_[2];
+	my $title = "$value.$field";
+	if (defined($_[3])) {
+		$title = $_[3];
+	}
+	if (defined($values{$value}{$field})) {
+		print "$title $values{$value}{$field}\n";
+	} else {
+		return 0;
+	}
+}
+
+# Walk through the relevant aspect and print all top-level configuration
+# values and value-definitions. 
+sub get_config
+{
+	my $graph = $_[0];
+
+	# Need to double-check since set_aspect only checks this if there
+	# is no argument (suggest/autoconf doesn't require a valid aspect)
+	if (!defined($ASPECTS{$graph})) {
+		usage "No such aspect";
+	}
+	my %values = %{$ASPECTS{$graph}{'values'}};
+
+	print "graph_category Varnish\n";
+	foreach my $field (@graph_parameters) {
+		print_if_exist(\%ASPECTS,$graph,$field,"graph_$field");
+	}
+
+	foreach my $value (keys %values) {
+		# Need either RPN definition or a varnishstat value.
+		if (!defined($varnishstat{$value}) &&
+		    !defined($values{$value}{'rpn'})) {
+			if ($DEBUG) {
+				print "ERROR: $value not part of varnishstat.\n"
+			}
+			next;
+		}
+		
+		if (!print_if_exist(\%values,$value,'label')) {
+			print "$value.label $varnishstatnames{$value}\n";
+		}
+		foreach my $field (@field_parameters) {
+			print_if_exist(\%values,$value,$field);
+		}
+	}
+}
+
+# Read and verify the aspect ($self). 
+sub set_aspect
+{
+	$self = $0;
+	$self =~ s/^.*\/varnish_//;
+	if (!defined($ASPECTS{$self}) && @ARGV == 0) {
+		usage "No such aspect";
+	}
+}
+
+# Handle arguments (config, autoconf, suggest)
+# Populate stats for config is necessary, but we want to avoid it for
+# autoconf as it would generate a nasty error.
+sub check_args
+{
+	if (@ARGV && $ARGV[0] eq '') {
+		shift @ARGV;
+	}
+	if (@ARGV == 1) {
+		if ($ARGV[0] eq "config") {
+			populate_stats;  
+			get_config($self);
+			exit 0;
+		} elsif ($ARGV[0] eq "autoconf") {
+			autoconf($self);
+			exit 0;
+		} elsif ($ARGV[0] eq "suggest") {
+			suggest;
+			exit 0;
+		}
+		usage "Unknown argument";
+	}
+}
+
+# Braindead RPN: +,-,/,* will pop two items from @stack, and perform
+# the relevant operation on the items. If the item in the array isn't one
+# of the 4 basic math operations, a value from varnishstat is pushed on to
+# the stack. IE: 'client_req','client_conn','/' will leave the value of
+# "client_req/client_conn" on the stack.
+#
+# If only one item is left on the stack, it is printed. Otherwise, an error
+# message is printed.
+sub rpn
+{
+	my @stack;
+	my $left;
+	my $right;
+	foreach my $item (@{$_[0]}) {
+		if ($item eq "+") {
+			$right = pop(@stack);
+			$left = pop(@stack);
+			push(@stack,$left+$right);
+		} elsif ($item eq "-") {
+			$right = pop(@stack);
+			$left = pop(@stack);
+			push(@stack,$left-$right);
+		} elsif ($item eq "/") {
+			$right = pop(@stack);
+			$left = pop(@stack);
+			push(@stack,$left/$right);
+		} elsif ($item eq "*") {
+			$right = pop(@stack);
+			$left = pop(@stack);
+			push(@stack,$left*$right);
+		} else {
+			push(@stack,int($varnishstat{$item}));
+		}
+	}
+	if (@stack > 1)
+	{
+		print STDERR "RPN error: Stack has more than one item left.\n";
+		print STDERR "@stack\n";
+		exit 255;
+	}
+	print "@stack";
+	print "\n";
+}
+
+################################
+# Execution starts here        #
+################################
+
+set_aspect;
+check_args;
+populate_stats; 
+
+# We only get here if we're supposed to.
+
+# Walks through the relevant values and either prints the varnishstat, or
+# if the 'rpn' variable is set, calls rpn() to execute ... the rpn.
+# 
+# NOTE: Due to differences in varnish-versions, this checks if the value
+# actually exist before using it.
+foreach my $value (keys %{$ASPECTS{$self}{'values'}}) {
+	if (defined($ASPECTS{$self}{'values'}{$value}{'rpn'})) {
+		print "$value.value ";
+		rpn($ASPECTS{$self}{'values'}{$value}{'rpn'});
+	} else {
+		if (!defined($varnishstat{$value})) {
+			if ($DEBUG) {
+				print STDERR "Error: $value not part of "
+					   . "varnishstat.\n";
+			}
+			next;
+		}
+		print "$value.value ";
+		print "$varnishstat{$value}\n";
+	}
+}


Property changes on: trunk/varnish-tools/munin/varnish_
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/varnish-tools/munin/varnish_munin_plugin.pl
===================================================================
--- trunk/varnish-tools/munin/varnish_munin_plugin.pl	2009-04-13 20:34:03 UTC (rev 4032)
+++ trunk/varnish-tools/munin/varnish_munin_plugin.pl	2009-04-14 10:27:42 UTC (rev 4033)
@@ -1,254 +0,0 @@
-#!/usr/bin/perl -w
-#-
-# Copyright (c) 2007-2009 Linpro AS
-# All rights reserved.
-#
-# Author: Dag-Erling Sm?rgrav <des at des.no>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $Id$
-#
-
-use strict;
-
-our %varnishstat;
-
-our %ASPECTS = (
-    'ratio' => {
-	'title' => 'Hit / miss ratio',
-	'type' => 'percent',
-	'order' => [ 'hit', 'miss' ],
-	'values' => {
-	    'hit' => {
-		'label' => 'hits',
-		'numerator' => 'cache_hit',
-		'denominator' => [ '+', 'cache_hit', 'cache_miss' ],
-	    },
-	    'miss' => {
-		'label' => 'misses',
-		'numerator' => 'cache_miss',
-		'denominator' => [ '+', 'cache_hit', 'cache_miss' ],
-	    },
-	},
-    },
-    'usage' => {
-	'title' => 'Cache file usage',
-	'type' => 'percent',
-	'order' => [ 'used', 'free' ],
-	'values' => {
-	    'used' => {
-		'label' => 'used',
-		'numerator' => 'sm_balloc',
-		'denominator' => [ '+', 'sm_balloc', 'sm_bfree' ],
-	    },
-	    'free' => {
-		'label' => 'free',
-		'numerator' => 'sm_bfree',
-		'denominator' => [ '+', 'sm_balloc', 'sm_bfree' ],
-	    },
-	},
-    },
-);
-
-sub varnishstat($);
-sub varnishstat($) {
-    my $field = shift;
-
-    if (ref($field) eq 'ARRAY') {
-	die "Too few terms in $field"
-	    if @$field < 2;
-	my $acc = varnishstat($$field[1]);
-
-	foreach (@$field[2..$#$field]) {
-	    if ($$field[0] eq '+') {
-		$acc += varnishstat($_);
-	    } elsif ($$field[0] eq '-') {
-		$acc -= varnishstat($_);
-	    } elsif ($$field[0] eq '*') {
-		$acc *= varnishstat($_);
-	    } elsif ($$field[0] eq '/') {
-		$acc /= varnishstat($_);
-	    } else {
-		die "Invalid spec for $field\n";
-	    }
-	}
-	return $acc;
-    }
-    die "no such field: $field\n"
-	unless defined($varnishstat{$field});
-    return $varnishstat{$field};
-}
-
-sub value($$) {
-    my $value = shift;
-    my $type = shift;
-
-    defined($value) || die "oops";
-    if ($type eq 'count') {
-	return varnishstat($value->{'field'});
-    } elsif ($type eq 'gauge') {
-	return varnishstat($value->{'field'});
-    } elsif ($type eq 'percent') {
-	return sprintf("%.1f", varnishstat($value->{'numerator'}) * 100.0 /
-		       varnishstat($value->{'denominator'}));
-    } elsif ($type eq 'ratio') {
-	return sprintf("%.3f", varnishstat($value->{'numerator'}) /
-		       varnishstat($value->{'denominator'}));
-    } else {
-	die "oops";
-    }
-}
-
-sub order($) {
-    my $aspect = shift;
-
-    return (@{$aspect->{'order'}})
-	if (defined($aspect->{'order'}));
-    return (sort(keys(%{$aspect->{'values'}})));
-}
-
-sub measure($) {
-    my $aspect = shift;
-
-    defined($aspect) || die "oops";
-    my @order = order($aspect);
-    foreach (@order) {
-	print "$_.value ",
-	    value($aspect->{'values'}->{$_}, $aspect->{'type'}),
-	    "\n";
-    }
-}
-
-sub config($) {
-    my $aspect = shift;
-
-    defined($aspect) || die "oops";
-    print "graph_category Varnish\n";
-    print "graph_title $aspect->{'title'}\n";
-    if ($aspect->{'type'} eq 'percent') {
-	print "graph_scale no\n";
-    }
-    my @order = order($aspect);
-    print "graph_order ", join(' ', @order), "\n";
-    foreach (@order) {
-	my $value = $aspect->{'values'}->{$_};
-	print "$_.label $value->{'label'}\n";
-	print "$_.graph yes\n";
-	if ($aspect->{'type'} eq 'count') {
-	    print "$_.type COUNTER\n";
-	} elsif ($aspect->{'type'} eq 'gauge') {
-	    print "$_.type GAUGE\n";
-	} elsif ($aspect->{'type'} eq 'percent') {
-	    print "$_.type GAUGE\n";
-	    print "$_.min 0\n";
-	    print "$_.max 100\n";
-	    if ($_ eq $order[0]) {
-		print "$_.draw AREA\n";
-	    } else {
-		print "$_.draw STACK\n";
-	    }
-	}
-    }
-}
-
-sub read_varnishstat($) {
-    my $name = shift;
-    my ($rh, $wh);
-    my $pid;
-
-    pipe($rh, $wh)
-	or die "pipe(): $!\n";
-    defined($pid = fork())
-	or die "fork(): $!\n";
-    if ($pid == 0) {
-	close($rh);
-	open(STDOUT, ">&", $wh);
-	exec "varnishstat", "-1", $name ? ("-n", $name) : ()
-	    or die "exec(): $!\n";
-	die "not reachable\n";
-    }
-    close($wh);
-    while (<$rh>) {
-	if (m/^(\w+)\s+(\d+)\s+(\d*\.\d*)\s+(\w.*)$/) {
-	    $varnishstat{$1} = $2;
-	    $ASPECTS{$1} = {
-		'title' => $4,
-		'type' => ($3 eq ".") ? 'gauge' : 'count',
-		'values' => {
-		    $1 => {
-			'label' => $1,
-			'field' => $1,
-		    }
-		}
-	    };
-	}
-    }
-    close($rh);
-    waitpid($pid, 0)
-	or die "waitpid(): $!\n";
-    if ($? & 0x80) {
-	die "varnishstat received signal ", $? && 0x7f, "\n";
-    } elsif ($?) {
-	die "varnishstat returned exit code ", $? >> 8, "\n";
-    }
-}
-
-sub usage() {
-
-    print STDERR "usage: varnish_<aspect> [config]\n";
-    print STDERR "aspects: ", join(', ', sort keys %ASPECTS), "\n";
-    exit 1;
-}
-
-MAIN:{
-    read_varnishstat($ENV{'VARNISH_NAME'});
-
-    my $aspect;
-    ($aspect = $0) =~ s|^(?:.*/)varnish_(\w+)$|$1|;
-
-    # XXX bug in munin-node
-    shift @ARGV
-	if (@ARGV && $ARGV[0] eq '');
-
-    if (@ARGV == 0) {
-	defined($ASPECTS{$aspect})
-	    or usage();
-	measure($ASPECTS{$aspect});
-    } elsif (@ARGV == 1) {
-	if ($ARGV[0] eq 'autoconf') {
-	    print "yes\n";
-	} elsif ($ARGV[0] eq 'aspects') {
-	    foreach (sort keys %ASPECTS) {
-		print "$_\n";
-	    }
-	} elsif ($ARGV[0] eq 'config') {
-	    defined($ASPECTS{$aspect})
-		or usage();
-	    config($ASPECTS{$aspect});
-	} else {
-	    usage();
-	}
-    } else {
-	usage();
-    }
-}



From kristian at projects.linpro.no  Fri Apr 17 12:27:33 2009
From: kristian at projects.linpro.no (kristian at projects.linpro.no)
Date: Fri, 17 Apr 2009 14:27:33 +0200 (CEST)
Subject: r4034 - trunk/varnish-tools/munin
Message-ID: <20090417122733.1810E1F76C4@projects.linpro.no>

Author: kristian
Date: 2009-04-17 14:27:32 +0200 (Fri, 17 Apr 2009)
New Revision: 4034

Modified:
   trunk/varnish-tools/munin/varnish_
Log:
POD-documentation + config for the munin-plugin

Modified: trunk/varnish-tools/munin/varnish_
===================================================================
--- trunk/varnish-tools/munin/varnish_	2009-04-14 10:27:42 UTC (rev 4033)
+++ trunk/varnish-tools/munin/varnish_	2009-04-17 12:27:32 UTC (rev 4034)
@@ -18,28 +18,72 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-##########
-# Parameteres: 
-#	
-#	config (required)
-#	autoconf (optional - used by munin-conf)
-#	suggest (optional - used by munin-conf to determine valid symlinks)
-#
-# A few aspects are not linked by default. They are marked as 
-# 'DEBUG' => 'yes' (or any other value). They are:
-#
-# data_structures, vcl_and_purges, lru, objects_per_objhead,
-# obj_sendfile_vs_write, losthdr, esi, hcb, shm, shm_writes, overflow,
-# session, session_herd
-#
-# You can link them yourself with something like this:
-# ln -s /foo/varnish_ /etc/munin/plugins/varnish_data_structures
-#
-# Magic markers: Optional but should be included.
-#%# family=auto
-#%# capabilities=autoconf suggest
 
+=head1 NAME
+
+varnish_ - Munin plugin to monitor various aspects of varnish
+
+=head1 APPLICABLE SYSTEMS
+
+Varnish 2.0 or newer with varnishstat
+
+=head1 CONFIGURATION
+
+The plugin needs to be able to execute varnishstat. 
+
+The configuration section shows the defaults
+  [varnish_*]
+     env.varnishstat varnishstat
+     env.name 
+
+env.varnishstat can be a full path to varnishstat if it's
+not in the path already. 
+
+env.name is blank (undefined) by default and can be used to specify a -l
+name argument to varnish if multiple instances are running on the same
+server.
+
+A few aspects are not linked by default. They are marked as 
+'DEBUG' => 'yes' (or any other value). They are:
+
+data_structures, vcl_and_purges, lru, objects_per_objhead,
+obj_sendfile_vs_write, losthdr, esi, hcb, shm, shm_writes, overflow,
+session, session_herd
+
+You can link them yourself with something like this:
+ln -s /foo/varnish_ /etc/munin/plugins/varnish_data_structures
+
+=head1 INTERPERTATION
+
+Each graph uses data from varnishstat.
+
+=head1 MAGIC MARKERS
+
+ #%# family=auto
+ #%# capabilities=autoconf suggest
+
+=head1 VERSION
+
+ $Id$
+
+=head1 BUGS
+
+The hit_rate graph requires munin r2040 or newer to display
+correctly.
+
+=head1 AUTHOR
+
+Kristian Lyngstol <kristian at redpill-linpro.com>
+
+=head1 LICENSE
+
+GPLv2
+
+=cut 
+
+# FIXME: License?
+
+
 use strict;
 
 # Set to 1 to enable output when a variable is defined in a graph but
@@ -50,8 +94,11 @@
 my $FULL_SUGGEST = 0;
 
 # Varnishstat executable. Include full path if it's not in your path.
-my $varnishstat = "varnishstat";
+my $varnishstatexec = exists $ENV{'varnishstat'} ? $ENV{'varnishstat'} : "varnishstat";
 
+# For multiple instances
+my $varnishname = exists $ENV{'name'} ? $ENV{'name'} : undef;
+
 my %varnishstat = ();
 my %varnishstatnames = ();
 my $self; # Haha, myself, what a clever pun.
@@ -593,7 +640,11 @@
 # descriptions.
 sub populate_stats
 {
-	foreach my $line (`$varnishstat -1`) {
+	my $arg = "-1";
+	if ($varnishname) {
+		$arg .= " -l $varnishname";
+	} 
+	foreach my $line (`$varnishstatexec $arg`) {
 		chomp($line);
 		if ($line =~ /^([^ ]*)\s+(\d+)\s+(\d*\.\d*)\s+(.*)$/) {
 			$varnishstat{"$1"} = $2;
@@ -617,8 +668,8 @@
 # Otherwise exit with false and a human-readable reason.
 sub autoconf
 {
-	if (`which $varnishstat` eq '') {
-		print "no (which $varnishstat returns blank)\n";
+	if (`which $varnishstatexec` eq '') {
+		print "no (which $varnishstatexec returns blank)\n";
 		exit 1;
 	}
 	print "yes\n";



From phk at projects.linpro.no  Mon Apr 27 10:03:53 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 27 Apr 2009 12:03:53 +0200 (CEST)
Subject: r4035 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20090427100353.66F201F7B9D@projects.linpro.no>

Author: phk
Date: 2009-04-27 12:03:53 +0200 (Mon, 27 Apr 2009)
New Revision: 4035

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc
Log:
Make sure the esi parser kicks in.



Modified: trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc	2009-04-17 12:27:32 UTC (rev 4034)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc	2009-04-27 10:03:53 UTC (rev 4035)
@@ -6,7 +6,7 @@
         rxreq
         expect req.url == "/foo"
         txresp -hdr "Connection: close"
-        send {                                         }
+        send {<x>                                      }
 } -start
 
 varnish v1 -vcl+backend {



From phk at projects.linpro.no  Mon Apr 27 10:32:23 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 27 Apr 2009 12:32:23 +0200 (CEST)
Subject: r4036 - in trunk/varnish-cache/bin: varnishd varnishtest/tests
Message-ID: <20090427103223.5A1F32816C@projects.linpro.no>

Author: phk
Date: 2009-04-27 12:32:23 +0200 (Mon, 27 Apr 2009)
New Revision: 4036

Added:
   trunk/varnish-cache/bin/varnishtest/tests/r00494.vtc
Modified:
   trunk/varnish-cache/bin/varnishd/cache_http.c
Log:
Implement HTTP continuation lines.

Fixes #494



Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-27 10:03:53 UTC (rev 4035)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-27 10:32:23 UTC (rev 4036)
@@ -326,12 +326,29 @@
 	hp->conds = 0;
 	r = NULL;		/* For FlexeLint */
 	for (; p < t.e; p = r) {
-		/* XXX: handle continuation lines */
-		q = strchr(p, '\n');
-		assert(q != NULL);
-		r = q + 1;
-		if (q > p && q[-1] == '\r')
-			q--;
+
+		/* Find end of next header */
+		q = r = p;
+		while (r < t.e) {
+			if (!vct_iscrlf(*r)) {
+				r++;
+				continue;
+			}
+			q = r;
+			assert(r < t.e);
+			r += vct_skipcrlf(r);
+			if (r >= t.e)
+				break;
+			/* If line does not continue: got it. */
+			if (!vct_issp(*r))
+				break;
+
+			/* Clear line continuation LWS to spaces */
+			while (vct_islws(*q))
+				*q++ = ' ';
+		}
+
+		/* Empty header = end of headers */
 		if (p == q)
 			break;
 

Added: trunk/varnish-cache/bin/varnishtest/tests/r00494.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00494.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00494.vtc	2009-04-27 10:32:23 UTC (rev 4036)
@@ -0,0 +1,27 @@
+# $Id$
+
+test "HTTP continuation lines"
+
+#NB: careful about spaces and tabs in this test.
+
+server s1 {
+	rxreq
+	txresp -hdr {Foo: bar,
+	barf: fail} -body "xxx"
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_fetch {
+		set beresp.http.bar = beresp.http.foo;
+		remove beresp.http.foo;
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.http.bar == "bar,  barf: fail"
+	expect resp.http.barf == resp.http.barf
+	expect resp.http.foo == resp.http.foo
+} -run
+



From phk at projects.linpro.no  Mon Apr 27 15:01:20 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 27 Apr 2009 17:01:20 +0200 (CEST)
Subject: r4037 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090427150120.C68B91F7B9D@projects.linpro.no>

Author: phk
Date: 2009-04-27 17:01:20 +0200 (Mon, 27 Apr 2009)
New Revision: 4037

Modified:
   trunk/varnish-cache/bin/varnishd/shmlog.c
Log:
Don't complain if we cannot mlock(2) the shmlog, it is to be expected
with priv-sep.



Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-27 10:32:23 UTC (rev 4036)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2009-04-27 15:01:20 UTC (rev 4037)
@@ -375,10 +375,7 @@
 	    MAP_HASSEMAPHORE | MAP_NOSYNC | MAP_SHARED,
 	    heritage.vsl_fd, 0);
 	xxxassert(loghead != MAP_FAILED);
-	i = mlock(loghead, heritage.vsl_size);
-	if (i != 0)
-		fprintf(stderr, "Notice: locking SHMFILE in core failed: %s\n",
-		    strerror(errno));
+	(void)mlock(loghead, heritage.vsl_size);
 	VSL_stats = &loghead->stats;
 	pp = (void *)(loghead + 1);
 	*pp = *params;



From sky at projects.linpro.no  Mon Apr 27 22:18:25 2009
From: sky at projects.linpro.no (sky at projects.linpro.no)
Date: Tue, 28 Apr 2009 00:18:25 +0200 (CEST)
Subject: r4038 - in trunk/varnish-cache/bin: varnishd varnishtest/tests
Message-ID: <20090427221825.2BB2E38081@projects.linpro.no>

Author: sky
Date: 2009-04-28 00:18:24 +0200 (Tue, 28 Apr 2009)
New Revision: 4038

Added:
   trunk/varnish-cache/bin/varnishtest/tests/r00498.vtc
Modified:
   trunk/varnish-cache/bin/varnishd/cache_http.c
Log:
fix for #498 -- if a return header overran the obj_workspace (but was small enough to fit in sess_workspace) the header is dropped and an empty slot is put in there -- rest of the code now detects this empty slot. It should probably ask VLC what to do if a header is dropped

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-27 15:01:20 UTC (rev 4037)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-27 22:18:24 UTC (rev 4038)
@@ -151,6 +151,11 @@
 	unsigned u;
 
 	for (u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		/* XXX We have to check for empty header entries
+		   because a header could have been lost in 
+		   http_copyHome */
+		if (hp->hd[u].b == NULL)
+			continue;
 		Tcheck(hp->hd[u]);
 		if (hp->hd[u].e < hp->hd[u].b + l + 1)
 			continue;
@@ -631,6 +636,8 @@
 	to->nhd = HTTP_HDR_FIRST;
 	to->status = fm->status;
 	for (u = HTTP_HDR_FIRST; u < fm->nhd; u++) {
+		if (fm->hd[u].b == NULL)
+			continue;
 		if (fm->hdf[u] & HDF_FILTER)
 			continue;
 #define HTTPH(a, b, c, d, e, f, g) \
@@ -686,6 +693,8 @@
 			hp->hd[u].b = p;
 			hp->hd[u].e = p + l;
 		} else {
+			/* XXX This leaves a slot empty */
+			VSL_stats->losthdr++;
 			WSLR(w, SLT_LostHeader, fd, hp->hd[u]);
 			hp->hd[u].b = NULL;
 			hp->hd[u].e = NULL;
@@ -804,6 +813,8 @@
 	unsigned u, v;
 
 	for (v = u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		if (hp->hd[u].b == NULL)
+			continue;
 		if (http_IsHdr(&hp->hd[u], hdr))
 			continue;
 		if (v != u) {
@@ -840,6 +851,8 @@
 		WSLH(w, *w->wfd, hp, HTTP_HDR_PROTO);
 	}
 	for (u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		if (hp->hd[u].b == NULL)
+			continue;
 		AN(hp->hd[u].b);
 		AN(hp->hd[u].e);
 		l += WRW_WriteH(w, &hp->hd[u], "\r\n");

Added: trunk/varnish-cache/bin/varnishtest/tests/r00498.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00498.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00498.vtc	2009-04-27 22:18:24 UTC (rev 4038)
@@ -0,0 +1,18 @@
+# $Id: r00445.vtc 3987 2009-03-23 11:54:19Z sky $
+
+test "very very very long return header"
+
+server s1 {
+	rxreq
+	expect req.url == "/"
+	txresp -hdr "Location: 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" -body {foo}
+} -start
+
+varnish v1 -vcl+backend {
+} -start
+
+client c1 {
+	txreq 
+	rxresp
+	expect resp.bodylen == 3
+} -run



From phk at projects.linpro.no  Tue Apr 28 08:33:19 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 28 Apr 2009 10:33:19 +0200 (CEST)
Subject: r4039 - in trunk/varnish-cache: . lib
Message-ID: <20090428083319.EC5641F7BA4@projects.linpro.no>

Author: phk
Date: 2009-04-28 10:33:19 +0200 (Tue, 28 Apr 2009)
New Revision: 4039

Modified:
   trunk/varnish-cache/configure.ac
   trunk/varnish-cache/lib/Makefile.am
Log:
Reorder libraries

add "-Wl,--as-needed" to EXTRA_DEVELOPER_CFLAGS to try to prevent
future unordering.

Fixes #486



Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2009-04-27 22:18:24 UTC (rev 4038)
+++ trunk/varnish-cache/configure.ac	2009-04-28 08:33:19 UTC (rev 4039)
@@ -305,7 +305,7 @@
 DEVELOPER_CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wformat"
 
 # Additional flags for GCC 4
-EXTRA_DEVELOPER_CFLAGS="-Wextra -Wno-missing-field-initializers -Wno-sign-compare"
+EXTRA_DEVELOPER_CFLAGS="-Wextra -Wno-missing-field-initializers -Wno-sign-compare -Wl,--as-needed"
 
 # --enable-developer-warnings
 AC_ARG_ENABLE(developer-warnings,

Modified: trunk/varnish-cache/lib/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/Makefile.am	2009-04-27 22:18:24 UTC (rev 4038)
+++ trunk/varnish-cache/lib/Makefile.am	2009-04-28 08:33:19 UTC (rev 4039)
@@ -1,15 +1,15 @@
 # $Id$
 
 SUBDIRS = \
+	libvarnishcompat \
 	libvarnish \
 	libvarnishapi \
-	libvarnishcompat \
 	libvcl \
 	@JEMALLOC_SUBDIR@
 
 DIST_SUBDIRS = 	\
+	libvarnishcompat \
 	libvarnish \
 	libvarnishapi \
-	libvarnishcompat \
 	libvcl \
 	libjemalloc



From tfheen at projects.linpro.no  Tue Apr 28 11:46:31 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Tue, 28 Apr 2009 13:46:31 +0200 (CEST)
Subject: r4040 - in branches/2.0/varnish-cache/bin: varnishd varnishtest/tests
Message-ID: <20090428114631.4A7931F7BAC@projects.linpro.no>

Author: tfheen
Date: 2009-04-28 13:46:30 +0200 (Tue, 28 Apr 2009)
New Revision: 4040

Added:
   branches/2.0/varnish-cache/bin/varnishtest/tests/r00498.vtc
Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_http.c
Log:
Merge r4038: Handle obj_workspace overruns better


fix for #498 -- if a return header overran the obj_workspace (but was small
enough to fit in sess_workspace) the header is dropped and an empty slot is put
in there -- rest of the code now detects this empty slot. It should probably
ask VLC what to do if a header is dropped



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_http.c	2009-04-28 08:33:19 UTC (rev 4039)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_http.c	2009-04-28 11:46:30 UTC (rev 4040)
@@ -152,6 +152,11 @@
 	unsigned u;
 
 	for (u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		/* XXX We have to check for empty header entries
+		   because a header could have been lost in 
+		   http_copyHome */
+		if (hp->hd[u].b == NULL)
+			continue;
 		Tcheck(hp->hd[u]);
 		if (hp->hd[u].e < hp->hd[u].b + l + 1)
 			continue;
@@ -615,6 +620,8 @@
 	to->nhd = HTTP_HDR_FIRST;
 	to->status = fm->status;
 	for (u = HTTP_HDR_FIRST; u < fm->nhd; u++) {
+		if (fm->hd[u].b == NULL)
+			continue;
 		if (fm->hdf[u] & HDF_FILTER)
 			continue;
 #define HTTPH(a, b, c, d, e, f, g) \
@@ -675,6 +682,8 @@
 			hp->hd[u].b = p;
 			hp->hd[u].e = p + l;
 		} else {
+			/* XXX This leaves a slot empty */
+			VSL_stats->losthdr++;
 			WSLR(w, SLT_LostHeader, fd, hp->hd[u]);
 			hp->hd[u].b = NULL;
 			hp->hd[u].e = NULL;
@@ -793,6 +802,8 @@
 	unsigned u, v;
 
 	for (v = u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		if (hp->hd[u].b == NULL)
+			continue;
 		if (http_IsHdr(&hp->hd[u], hdr))
 			continue;
 		if (v != u) {
@@ -829,6 +840,8 @@
 		WSLH(w, *w->wfd, hp, HTTP_HDR_PROTO);
 	}
 	for (u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
+		if (hp->hd[u].b == NULL)
+			continue;
 		AN(hp->hd[u].b);
 		AN(hp->hd[u].e);
 		l += WRW_WriteH(w, &hp->hd[u], "\r\n");

Copied: branches/2.0/varnish-cache/bin/varnishtest/tests/r00498.vtc (from rev 4038, trunk/varnish-cache/bin/varnishtest/tests/r00498.vtc)
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/r00498.vtc	                        (rev 0)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/r00498.vtc	2009-04-28 11:46:30 UTC (rev 4040)
@@ -0,0 +1,18 @@
+# $Id: r00445.vtc 3987 2009-03-23 11:54:19Z sky $
+
+test "very very very long return header"
+
+server s1 {
+	rxreq
+	expect req.url == "/"
+	txresp -hdr "Location: 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" -body {foo}
+} -start
+
+varnish v1 -vcl+backend {
+} -start
+
+client c1 {
+	txreq 
+	rxresp
+	expect resp.bodylen == 3
+} -run



From phk at projects.linpro.no  Wed Apr 29 08:04:26 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 29 Apr 2009 10:04:26 +0200 (CEST)
Subject: r4041 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090429080426.8CC8E1F76ED@projects.linpro.no>

Author: phk
Date: 2009-04-29 10:04:26 +0200 (Wed, 29 Apr 2009)
New Revision: 4041

Modified:
   trunk/varnish-cache/bin/varnishd/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Remove now unused backend_http11 parameter, it is on by definition now.



Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-04-28 11:46:30 UTC (rev 4040)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-04-29 08:04:26 UTC (rev 4041)
@@ -127,7 +127,6 @@
 	unsigned		listen_depth;
 
 	/* HTTP proto behaviour */
-	unsigned		backend_http11;
 	unsigned		client_http11;
 
 	/* CLI related */

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-28 11:46:30 UTC (rev 4040)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-29 08:04:26 UTC (rev 4041)
@@ -576,12 +576,6 @@
 		"Listen queue depth.",
 		MUST_RESTART,
 		"1024", "connections" },
-	{ "backend_http11", tweak_bool, &master.backend_http11, 0, 0,
-		"Force all backend requests to be HTTP/1.1.\n"
-		"By default we copy the protocol version from the "
-		"incoming client request.",
-		EXPERIMENTAL,
-		"on", "bool" },
 	{ "client_http11", tweak_bool, &master.client_http11, 0, 0,
 		"Force all client responses to be HTTP/1.1.\n"
 		"By default we copy the protocol version from the "



From phk at projects.linpro.no  Wed Apr 29 09:18:03 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 29 Apr 2009 11:18:03 +0200 (CEST)
Subject: r4042 - in trunk/varnish-cache/bin: varnishd varnishtest/tests
Message-ID: <20090429091803.3C7901F76FE@projects.linpro.no>

Author: phk
Date: 2009-04-29 11:18:02 +0200 (Wed, 29 Apr 2009)
New Revision: 4042

Added:
   trunk/varnish-cache/bin/varnishtest/tests/r00444.vtc
Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_http.c
Log:
Previously, we forced the request to "GET" on all fetches for cache
and this prevented users from implementing "purge on POST" semantics
by looking up the POST requests and ditching the object found.

Now we only overwrite the request with "GET" if it is a HEAD, (the
internal "wantbody" flag tells hos how the response should be composed.)

The testcase shold probably be elevated to VCL example, with suitable
footnotes about URL sanitizing etc.

Fixes #444



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-04-29 08:04:26 UTC (rev 4041)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-04-29 09:18:02 UTC (rev 4042)
@@ -979,7 +979,12 @@
 		return (0);
 	}
 
-	sp->wantbody = (strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD") != 0);
+	if (!strcmp(sp->http->hd[HTTP_HDR_REQ].b, "HEAD")) {
+		sp->wantbody = 0;
+		http_ForceGet(sp->http);
+	} else
+		sp->wantbody = 1;
+
 	sp->sendbody = 0;
 	switch(sp->handling) {
 	case VCL_RET_LOOKUP:

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-29 08:04:26 UTC (rev 4041)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-04-29 09:18:02 UTC (rev 4042)
@@ -555,23 +555,6 @@
 	to->hdf[n] = fm->hdf[n];
 }
 
-static void
-http_copyreq(struct http *to, const struct http *fm, int how)
-{
-
-	CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
-	CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
-
-	if ((how == HTTPH_R_PIPE) || (how == HTTPH_R_PASS)) {
-		http_copyh(to, fm, HTTP_HDR_REQ);
-		http_copyh(to, fm, HTTP_HDR_PROTO);
-	} else {
-		http_SetH(to, HTTP_HDR_REQ, "GET");
-		http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
-	}
-	http_copyh(to, fm, HTTP_HDR_URL);
-}
-
 void
 http_ForceGet(struct http *to)
 {
@@ -660,7 +643,12 @@
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 	hp->logtag = HTTP_Tx;
 
-	http_copyreq(hp, sp->http, how);
+	http_copyh(hp, sp->http, HTTP_HDR_REQ);
+	http_copyh(hp, sp->http, HTTP_HDR_URL);
+	if (how == HTTPH_R_FETCH)
+		http_SetH(hp, HTTP_HDR_PROTO, "HTTP/1.1");
+	else
+		http_copyh(hp, sp->http, HTTP_HDR_PROTO);
 	http_FilterFields(sp->wrk, sp->fd, hp, sp->http, how);
 	http_PrintfHeader(sp->wrk, sp->fd, hp, "X-Varnish: %u", sp->xid);
 	http_PrintfHeader(sp->wrk, sp->fd, hp,

Added: trunk/varnish-cache/bin/varnishtest/tests/r00444.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00444.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00444.vtc	2009-04-29 09:18:02 UTC (rev 4042)
@@ -0,0 +1,62 @@
+# $Id$
+
+test "purging on POST"
+
+server s1 {
+	rxreq
+	expect req.request == "GET"
+	txresp -body "1"
+
+	rxreq
+	expect req.request == "POST"
+	txresp -body "22"
+
+	rxreq
+	expect req.request == "POST"
+	txresp -body "333"
+
+	rxreq
+	expect req.request == "GET"
+	txresp -body "4444"
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_recv {
+		if (req.request == "POST") {
+			/* Lookup so we find any cached object */
+			lookup;
+		}
+	}
+	sub vcl_hit {
+		if (req.request == "POST") {
+			/* Get rid of this object */
+			set obj.cacheable = false;
+			set obj.ttl = 0s;
+			pass;
+		}
+	}
+	sub vcl_miss {
+		if (req.request == "POST") {
+			/* Make sure we don't cache the POST result */
+			pass;
+		}
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.bodylen == 1
+
+	txreq -req POST
+	rxresp
+	expect resp.bodylen == 2
+
+	txreq -req POST
+	rxresp
+	expect resp.bodylen == 3
+
+	txreq
+	rxresp
+	expect resp.bodylen == 4
+} -run



From phk at projects.linpro.no  Thu Apr 30 10:55:23 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Thu, 30 Apr 2009 12:55:23 +0200 (CEST)
Subject: r4043 - trunk/varnish-cache/bin/varnishd
Message-ID: <20090430105523.2C47E1F76FE@projects.linpro.no>

Author: phk
Date: 2009-04-30 12:55:22 +0200 (Thu, 30 Apr 2009)
New Revision: 4043

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_param.c
Log:
Bump the cli_timeout to 10 seconds.

Fixes #329



Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-29 09:18:02 UTC (rev 4042)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-04-30 10:55:22 UTC (rev 4043)
@@ -586,7 +586,7 @@
 		"Timeout for the childs replies to CLI requests from "
 		"the master.",
 		0,
-		"5", "seconds" },
+		"10", "seconds" },
 	{ "ping_interval", tweak_uint, &master.ping_interval, 0, UINT_MAX,
 		"Interval between pings from parent to child.\n"
 		"Zero will disable pinging entirely, which makes "