From tfheen at projects.linpro.no  Tue Nov  3 09:32:45 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Tue,  3 Nov 2009 10:32:45 +0100 (CET)
Subject: r4340 - branches/2.0/varnish-cache/lib/libvarnishcompat
Message-ID: <20091103093245.B13551F732B@projects.linpro.no>

Author: tfheen
Date: 2009-11-03 10:32:45 +0100 (Tue, 03 Nov 2009)
New Revision: 4340

Modified:
   branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c
Log:
Merge missing part of r4058, adjust include path for execinfo.h

Modified: branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-10-23 09:18:41 UTC (rev 4339)
+++ branches/2.0/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-11-03 09:32:45 UTC (rev 4340)
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "execinfo.h"
+#include "compat/execinfo.h"
 
 void *getreturnaddr(int);
 void *getframeaddr(int);



From tfheen at projects.linpro.no  Wed Nov  4 09:38:08 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Wed,  4 Nov 2009 10:38:08 +0100 (CET)
Subject: r4341 - branches/2.0/varnish-cache/bin/varnishd
Message-ID: <20091104093808.7A73D1F73F8@projects.linpro.no>

Author: tfheen
Date: 2009-11-04 10:38:08 +0100 (Wed, 04 Nov 2009)
New Revision: 4341

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
Log:
Add missing bit of r4183

This bit got missing when we merged the new epoll acceptor for 2.0.

Disable SO_LINGER when we time out a connection due to sess_timeout,
so that we do not RST connections that have still not transmitted
their data.

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c	2009-11-03 09:32:45 UTC (rev 4340)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_epoll.c	2009-11-04 09:38:08 UTC (rev 4341)
@@ -192,6 +192,7 @@
 			if (sp->t_open > deadline)
 				break;
 			VTAILQ_REMOVE(&sesshead, sp, list);
+			TCP_linger(sp->fd, 0);
 			vca_close_session(sp, "timeout");
 			SES_Delete(sp);
 		}



From tfheen at projects.linpro.no  Fri Nov  6 09:27:25 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Fri,  6 Nov 2009 10:27:25 +0100 (CET)
Subject: r4342 - branches/2.0/varnish-cache/doc
Message-ID: <20091106092725.07BC81F7425@projects.linpro.no>

Author: tfheen
Date: 2009-11-06 10:27:24 +0100 (Fri, 06 Nov 2009)
New Revision: 4342

Added:
   branches/2.0/varnish-cache/doc/changes-2.0.4-2.0.5.xml
   branches/2.0/varnish-cache/doc/changes-2.0.5.xml
Modified:
   branches/2.0/varnish-cache/doc/Makefile.am
Log:
Document changes to 2.0.5

Modified: branches/2.0/varnish-cache/doc/Makefile.am
===================================================================
--- branches/2.0/varnish-cache/doc/Makefile.am	2009-11-04 09:38:08 UTC (rev 4341)
+++ branches/2.0/varnish-cache/doc/Makefile.am	2009-11-06 09:27:24 UTC (rev 4342)
@@ -1,6 +1,7 @@
 # $Id$
 
 CHANGELOGS = \
+	changes-2.0.5.html \
 	changes-2.0.4.html \
 	changes-2.0.3.html \
 	changes-2.0.2.html \
@@ -12,6 +13,7 @@
 	changes-1.0.4.html
 
 XML = \
+	changes-2.0.4-2.0.5.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 \

Added: branches/2.0/varnish-cache/doc/changes-2.0.4-2.0.5.xml
===================================================================
--- branches/2.0/varnish-cache/doc/changes-2.0.4-2.0.5.xml	                        (rev 0)
+++ branches/2.0/varnish-cache/doc/changes-2.0.4-2.0.5.xml	2009-11-06 09:27:24 UTC (rev 4342)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE group [
+<!ENTITY mdash "&#8212;">
+]>
+<!-- $Id$ -->
+<group from="2.0.4" to="2.0.5">
+  <subsystem>
+    <name>varnishd</name>
+
+    <change type="bug" ref="498">
+      <para>Handle object workspace overruns better.</para>
+    </change>
+
+    <change type="enh">
+      <para>Allow turning off ESI processing per request by using
+      <code>set req.esi = off</code>.</para>
+    </change>
+
+    <change type="enh">
+      <para>Tell the kernel that we expect to use the mmap-ed file in
+      a random fashion.  On Linux, this turns off/down readahead and
+      increases performance.</para>
+    </change>
+
+    <change type="enh">
+      <para>Make it possible to change the maximum number of HTTP
+      headers we allow by
+      passing <code>--with-max-header-fields=NUM</code> rather than
+      changing the code.</para>
+    </change>
+
+    <change type="enh" ref="428">
+      <para>Implement support for HTTP continuation lines.</para>
+    </change>
+
+    <change type="enh">
+      <para>Change how connections are closed and only use SO_LINGER
+      for orderly connection closure.  This should hopefully make
+      worker threads less prone to hangups on network problems.</para>
+    </change>
+
+    <change type="bug" ref="502">
+      <para>Handle multi-element purges correctly.  Previously we
+      ended up with parse errors when this was done from VCL.</para>
+    </change>
+
+    <change type="bug" ref="506, 549">
+      <para>Handle illegal responses from the backend better by
+      serving a 503 page rather than panic-ing.</para>
+    </change>
+
+    <change type="enh">
+      <para>When we run into an assertion that is not true, Varnish
+      would previously dump a little bit of information about itself.
+      Extend that information with a backtrace.  Note that this relies
+      on the varnish binary being unstripped.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add a session_max parameter that limits the maximum
+      number of sessions we keep open before we start dropping new
+      connections summarily.</para>
+    </change>
+
+    <change type="bug">
+      <para>Try to consume less memory when doing ESI processing by
+      properly rolling back used workspace after processing an
+      object.  This should make it possible to
+      turn <code>sess_workspace</code> quite a bit for users with
+      ESI-heavy pages.</para>
+    </change>
+
+    <change type="enh">
+      <para>Turn on <code>session_linger</code> by default.  Tests
+      have shown that <code>session_linger</code> helps a fair bit
+      with performance.</para>
+    </change>
+
+    <change type="enh">
+      <para>Rewrite the epoll acceptor for better performance.  This
+      should lead to both higher processing rates and maximum number
+      of connections on Linux.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add If-None-Match support, this gives significant
+      bandwidth savings for users with compliant browsers.</para>
+    </change>
+
+    <change type="bug" ref="529">
+      <para>RFC2616 specifies
+      that <code>ETag</code>, <code>Content-Location</code>, <code>Expires</code>, <code>Cache-Control</code>
+      and <code>Vary</code> should be emitted when delivering a
+      response with the 304 response code.</para>
+    </change>
+
+    <change type="bug" ref="531">
+      <para>Various fixes which makes Varnish compile and work on AIX.</para>
+    </change>
+
+    <change type="enh">
+      <para>Turn on TCP_DEFER_ACCEPT on Linux.  This should make us
+      less suspecible to denial of service attacks as well as give us
+      slightly better performance.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add an <code>.initial</code> property to the backend
+      probe specification.  This is the number of good probes we
+      pretend to have seen.  The default is one less than .threshold,
+      which means the first probe will decide if we consider the
+      backend healthy.</para>
+    </change>
+
+    <change type="enh">
+      <para>Make it possible to compare strings against other
+      string-like objects, not just plain strings.  This allows you to
+      compare two headers, for instance.</para>
+    </change>
+
+    <change type="bug">
+      <para>When support for <code>restart</code>
+      in <code>vcl_error</code> was added, there was no check to
+      prevent infinte recursion.  This has now been fixed.
+     </para>
+    </change>
+
+    <change type="enh">
+      <para>Turn on purge_dups by default.  This should make us
+      consume less memory when there are many bans for the same
+      pattern added.</para>
+    </change>
+
+    <change type="enh">
+      <para>Add a new log tag called <code>FetchError</code> which
+      tries to explain why we could not fetch an object from the
+      backend.</para>
+    </change>
+
+    <change type="enh">
+      <para>Change the default <code>srcaddr_ttl</code> to 0.  It is
+      not used by anything and has been removed in the development
+      version.  This will increase performance somewhat.</para>
+    </change>
+
+  </subsystem>
+
+  <subsystem>
+    <name>varnishtop</name>
+    <change type="bug" ref="514">
+      <para>varnishtop did not handle variable-length log fields
+      correctly. This is now fixed.</para>
+    </change>
+
+    <change type="enh">
+      <para>varnishtop previously did not print the name of the tag,
+      which made it very hard to understand.  We now print out the
+      tag name.</para>
+    </change>
+  </subsystem>
+</group>

Added: branches/2.0/varnish-cache/doc/changes-2.0.5.xml
===================================================================
--- branches/2.0/varnish-cache/doc/changes-2.0.5.xml	                        (rev 0)
+++ branches/2.0/varnish-cache/doc/changes-2.0.5.xml	2009-11-06 09:27:24 UTC (rev 4342)
@@ -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.5</version>
+
+  <xi:include href="changes-2.0.4-2.0.5.xml"/>
+</changelog>



From tfheen at projects.linpro.no  Fri Nov  6 10:00:47 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Fri,  6 Nov 2009 11:00:47 +0100 (CET)
Subject: r4343 - branches/2.0/varnish-cache/bin/varnishd
Message-ID: <20091106100047.196F81F732B@projects.linpro.no>

Author: tfheen
Date: 2009-11-06 11:00:46 +0100 (Fri, 06 Nov 2009)
New Revision: 4343

Modified:
   branches/2.0/varnish-cache/bin/varnishd/varnishd.c
Log:
Merge r4338: Send stderr to /dev/null when running nm

Previously, running varnishd -V would sometimes say:

nm: 'varnishd': No such file

which is wrong.  Silence this message



Modified: branches/2.0/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-11-06 09:27:24 UTC (rev 4342)
+++ branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-11-06 10:00:46 UTC (rev 4343)
@@ -463,7 +463,7 @@
 	struct symbols *s;
 
 	p = NULL;
-	asprintf(&p, "nm -an %s", a0);
+	asprintf(&p, "nm -an %s 2>/dev/null", a0);
 	if (p == NULL)
 		return;
 	fi = popen(p, "r");



From tfheen at projects.linpro.no  Mon Nov  9 10:16:05 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Mon,  9 Nov 2009 11:16:05 +0100 (CET)
Subject: r4344 - branches/2.0/varnish-cache
Message-ID: <20091109101605.BA20137F31@projects.linpro.no>

Author: tfheen
Date: 2009-11-09 11:16:05 +0100 (Mon, 09 Nov 2009)
New Revision: 4344

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

Modified: branches/2.0/varnish-cache/configure.ac
===================================================================
--- branches/2.0/varnish-cache/configure.ac	2009-11-06 10:00:46 UTC (rev 4343)
+++ branches/2.0/varnish-cache/configure.ac	2009-11-09 10:16:05 UTC (rev 4344)
@@ -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.4], [varnish-dev at projects.linpro.no])
+AC_INIT([Varnish], [2.0.5], [varnish-dev at projects.linpro.no])
 AC_CONFIG_SRCDIR(include/varnishapi.h)
 AM_CONFIG_HEADER(config.h)
 



From tfheen at projects.linpro.no  Mon Nov  9 10:18:01 2009
From: tfheen at projects.linpro.no (tfheen at projects.linpro.no)
Date: Mon,  9 Nov 2009 11:18:01 +0100 (CET)
Subject: r4345 - tags
Message-ID: <20091109101801.8C26C37F31@projects.linpro.no>

Author: tfheen
Date: 2009-11-09 11:18:01 +0100 (Mon, 09 Nov 2009)
New Revision: 4345

Added:
   tags/varnish-2.0.5/
Log:
Release 2.0.5


Copied: tags/varnish-2.0.5 (from rev 4344, branches/2.0)



From ingvar at projects.linpro.no  Mon Nov  9 14:09:59 2009
From: ingvar at projects.linpro.no (ingvar at projects.linpro.no)
Date: Mon,  9 Nov 2009 15:09:59 +0100 (CET)
Subject: r4346 - trunk/varnish-cache/redhat
Message-ID: <20091109140959.8E95137F31@projects.linpro.no>

Author: ingvar
Date: 2009-11-09 15:09:59 +0100 (Mon, 09 Nov 2009)
New Revision: 4346

Modified:
   trunk/varnish-cache/redhat/varnish.spec
Log:
Some changelog items from Fedora

Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2009-11-09 10:18:01 UTC (rev 4345)
+++ trunk/varnish-cache/redhat/varnish.spec	2009-11-09 14:09:59 UTC (rev 4346)
@@ -1,12 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.2
+Version: 2.0.5
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 #Patch0: varnish.varnishtest_debugflag.patch
+#Patch1: varnish.s390x_pagesize.patch
+#Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -64,12 +66,14 @@
 %setup -q
 #%setup -q -n varnish-cache
 
-#%patch0 -p0
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
+#%patch0 -p0
+#%patch1 -p0
+#%patch2 -p0
+
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
 	ppc64 | s390x | x86_64 | sparc64 )
@@ -91,7 +95,7 @@
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -235,6 +239,24 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
+- New upstream release
+
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
+* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
+  New upstream release 2.0.4 
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.3-1
   New upstream release 2.0.3. A bugfix and feature enhancement release
 



From ingvar at projects.linpro.no  Mon Nov  9 15:17:49 2009
From: ingvar at projects.linpro.no (ingvar at projects.linpro.no)
Date: Mon,  9 Nov 2009 16:17:49 +0100 (CET)
Subject: r4347 - branches/2.0/varnish-cache/redhat
Message-ID: <20091109151749.7E60337F31@projects.linpro.no>

Author: ingvar
Date: 2009-11-09 16:17:49 +0100 (Mon, 09 Nov 2009)
New Revision: 4347

Modified:
   branches/2.0/varnish-cache/redhat/varnish.spec
Log:
merged r4346 from trunk

Modified: branches/2.0/varnish-cache/redhat/varnish.spec
===================================================================
--- branches/2.0/varnish-cache/redhat/varnish.spec	2009-11-09 14:09:59 UTC (rev 4346)
+++ branches/2.0/varnish-cache/redhat/varnish.spec	2009-11-09 15:17:49 UTC (rev 4347)
@@ -1,12 +1,14 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
 Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz
 #Patch0: varnish.varnishtest_debugflag.patch
+#Patch1: varnish.s390x_pagesize.patch
+#Patch2: varnish.sparc_pagesize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -64,12 +66,13 @@
 %setup -q
 #%setup -q -n varnish-cache
 
-
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
 #./autogen.sh
 
 #%patch0 -p0
+#%patch1 -p0
+#%patch2 -p0
 
 # Hack to get 32- and 64-bits tests run concurrently on the same build machine
 case `uname -m` in
@@ -92,7 +95,7 @@
 %build
 
 # Remove "--disable static" if you want to build static libraries 
-# jemalloc is not compatible with Red Hat's ppc64 RHEL5 kernel koji server :-(
+# jemalloc is not compatible with Red Hat's ppc* RHEL5 kernel koji server :-(
 %ifarch ppc64 ppc
 %configure --disable-static --localstatedir=/var/lib --disable-jemalloc
 %else
@@ -236,6 +239,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
+- New upstream release
+
+* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
+- Added a sparc specific patch to libjemalloc.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu May 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
+- Added a s390 specific patch to libjemalloc.
+
 * Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
   New upstream release 2.0.4 
 



From phk at projects.linpro.no  Tue Nov 10 19:49:33 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 10 Nov 2009 20:49:33 +0100 (CET)
Subject: r4348 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091110194933.267661F73E5@projects.linpro.no>

Author: phk
Date: 2009-11-10 20:49:32 +0100 (Tue, 10 Nov 2009)
New Revision: 4348

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_client.c
Log:
Add a -repeat N facility to clients.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_client.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-09 15:17:49 UTC (rev 4347)
+++ trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-10 19:49:32 UTC (rev 4348)
@@ -58,6 +58,8 @@
 
 	char			*connect;
 
+	unsigned		repeat;
+
 	pthread_t		tp;
 };
 
@@ -75,26 +77,30 @@
 	struct vtclog *vl;
 	int fd;
 	int i;
+	unsigned u;
 
 	CAST_OBJ_NOTNULL(c, priv, CLIENT_MAGIC);
 	AN(c->connect);
 
 	vl = vtc_logopen(c->name);
 
-	vtc_log(vl, 2, "Started");
-	vtc_log(vl, 3, "Connect to %s", c->connect);
-	fd = VSS_open(c->connect);
-	for (i = 0; fd < 0 && i < 3; i++) {
-		(void)sleep(1);
+	if (c->repeat == 0)
+		c->repeat = 1;
+	vtc_log(vl, 2, "Started (%u iterations)", c->repeat);
+	for (u = 0; u < c->repeat; u++) {
+		vtc_log(vl, 3, "Connect to %s", c->connect);
 		fd = VSS_open(c->connect);
+		for (i = 0; fd < 0 && i < 3; i++) {
+			(void)sleep(1);
+			fd = VSS_open(c->connect);
+		}
+		assert(fd >= 0);
+		vtc_log(vl, 3, "Connected to %s fd is %d", c->connect, fd);
+		http_process(vl, c->spec, fd, 1);
+		vtc_log(vl, 3, "Closing fd %d", fd);
+		TCP_close(&fd);
 	}
-	assert(fd >= 0);
-	vtc_log(vl, 3, "Connected to %s fd is %d", c->connect, fd);
-	http_process(vl, c->spec, fd, 1);
-	vtc_log(vl, 3, "Closing fd %d", fd);
-	TCP_close(&fd);
 	vtc_log(vl, 2, "Ending");
-
 	return (NULL);
 }
 
@@ -223,6 +229,11 @@
 			av++;
 			continue;
 		}
+		if (!strcmp(*av, "-repeat")) {
+			c->repeat = atoi(av[1]);
+			av++;
+			continue;
+		}
 		if (!strcmp(*av, "-start")) {
 			client_start(c);
 			continue;



From phk at projects.linpro.no  Mon Nov 16 09:35:10 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 16 Nov 2009 10:35:10 +0100 (CET)
Subject: r4349 - in trunk/varnish-cache: bin/varnishd bin/varnishtest
	include/compat lib/libvarnishcompat
Message-ID: <20091116093510.4BEBA38D05@projects.linpro.no>

Author: phk
Date: 2009-11-16 10:35:09 +0100 (Mon, 16 Nov 2009)
New Revision: 4349

Modified:
   trunk/varnish-cache/bin/varnishd/cache_panic.c
   trunk/varnish-cache/bin/varnishtest/flint.lnt
   trunk/varnish-cache/bin/varnishtest/flint.sh
   trunk/varnish-cache/bin/varnishtest/vtc.c
   trunk/varnish-cache/bin/varnishtest/vtc_http.c
   trunk/varnish-cache/bin/varnishtest/vtc_log.c
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
   trunk/varnish-cache/include/compat/execinfo.h
   trunk/varnish-cache/lib/libvarnishcompat/execinfo.c
Log:
Hide GCC specific backtrace() compat function under a #ifdef.

We do not want to be dependent on GCC.

Fixes #577



Modified: trunk/varnish-cache/bin/varnishd/cache_panic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_panic.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishd/cache_panic.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -271,6 +271,8 @@
 	size_t i;
 
 	size = backtrace (array, 10);
+	if (size == 0)
+		return;
 	vsb_printf(vsp, "Backtrace:\n");
 	for (i = 0; i < size; i++) {
 		vsb_printf (vsp, "  ");

Modified: trunk/varnish-cache/bin/varnishtest/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishtest/flint.lnt	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/flint.lnt	2009-11-16 09:35:09 UTC (rev 4349)
@@ -11,7 +11,18 @@
 
 -esym(850, av)
 
+-esym(528, svnid)
 
+-ffc	// No automatic custody
+
+-e712	// 14      Info    712     Loss of precision (___) (___ to ___)
+-e747	// 16      Info    747     Significant prototype coercion (___) ___ to ___
+
+
+
+
+
+
 // -header(../../config.h)
 
 // Fix strchr() semtics, it can only return NULL if arg2 != 0

Modified: trunk/varnish-cache/bin/varnishtest/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishtest/flint.sh	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/flint.sh	2009-11-16 09:35:09 UTC (rev 4349)
@@ -1,30 +1,9 @@
 #!/bin/sh
 
-T=/tmp/_$$
 flexelint \
 	-I/usr/include \
 	-I. \
 	-I../../include \
 	-I../.. \
 	flint.lnt \
-	*.c > $T 2>&1
-
-for t in Error Warning Info Note
-do
-	sed -n "/$t [0-9][0-9][0-9]:/s/.*\($t [0-9][0-9][0-9]\).*/\1/p" $T
-done | awk '
-$2 == 830	{ next }
-$2 == 831	{ next }
-	{
-	i=$2"_"$1
-	h[i]++
-	n++
-	}
-END	{
-	printf "%5d %s\n", n, "Total"
-	for (i in h)
-		printf "%5d %s\n", h[i], i
-	}
-' | sort -rn
-
-cat $T
+	*.c 

Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -52,7 +52,7 @@
 char		*vtc_desc;
 int		vtc_error;		/* Error encountered */
 int		vtc_stop;		/* Stops current test without error */
-pthread_t	vtc_thread;;
+pthread_t	vtc_thread;
 
 /**********************************************************************
  * Read a file into memory

Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <ctype.h>
 
 #include "libvarnish.h"
 #include "vct.h"
@@ -521,6 +520,7 @@
 		if (!strcmp(*av, "-body")) {
 			AZ(body);
 			REPLACE(body, av[1]);
+			AN(body);
 			av++;
 			bodylen = strlen(body);
 			for (b = body; *b != '\0'; b++) {

Modified: trunk/varnish-cache/bin/varnishtest/vtc_log.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_log.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/vtc_log.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -33,7 +33,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -103,7 +103,7 @@
 	if (i != 0) {
 		vtc_log(v->vl, 0, "CLI failed (%s) = %d %u %s",
 		    cmd, i, retval, r);
-		return (retval);
+		return ((enum cli_status_e)retval);
 	}
 	assert(i == 0);
 	vtc_dump(v->vl, 4, "CLI RX", r);
@@ -213,12 +213,13 @@
 {
 	struct varnish *v;
 	char buf[BUFSIZ];
-	struct pollfd fds[1];
+	struct pollfd *fds, fd;
 	int i;
 
 	CAST_OBJ_NOTNULL(v, priv, VARNISH_MAGIC);
 	TCP_nonblocking(v->fds[0]);
 	while (1) {
+		fds = &fd;
 		memset(fds, 0, sizeof fds);
 		fds->fd = v->fds[0];
 		fds->events = POLLIN;
@@ -406,7 +407,7 @@
 		return;
 	u = varnish_ask_cli(v, cli, NULL);
 	vtc_log(v->vl, 2, "CLI %03u <%s>", u, cli);
-	if (exp != 0 && exp != u)
+	if (exp != 0 && exp != (unsigned)u)
 		vtc_log(v->vl, 0, "FAIL CLI response %u expected %u", u, exp);
 }
 
@@ -616,7 +617,7 @@
 		}
 		if (!strcmp(*av, "-cliok")) {
 			AN(av[1]);
-			varnish_cli(v, av[1], CLIS_OK);
+			varnish_cli(v, av[1], (unsigned)CLIS_OK);
 			av++;
 			continue;
 		}

Modified: trunk/varnish-cache/include/compat/execinfo.h
===================================================================
--- trunk/varnish-cache/include/compat/execinfo.h	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/include/compat/execinfo.h	2009-11-16 09:35:09 UTC (rev 4349)
@@ -35,7 +35,6 @@
 
 int     backtrace(void **, int);
 char ** backtrace_symbols(void *const *, int);
-void    backtrace_symbols_fd(void *const *, int, int);
 
 #ifdef __cplusplus
 }

Modified: trunk/varnish-cache/lib/libvarnishcompat/execinfo.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-11-10 19:49:32 UTC (rev 4348)
+++ trunk/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-11-16 09:35:09 UTC (rev 4349)
@@ -29,6 +29,10 @@
 #include "svnid.h"
 SVNID("$Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $")
 
+#include "compat/execinfo.h"
+
+#if defined (__GNUC__) && __GNUC__ >= 4	/* XXX Correct version to check for ? */
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <dlfcn.h>
@@ -39,10 +43,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "compat/execinfo.h"
 
-void *getreturnaddr(int);
-void *getframeaddr(int);
+static void *getreturnaddr(int);
+static void *getframeaddr(int);
 
 #define D10(x) ceil(log10(((x) == 0) ? 2 : ((x) + 1)))
 
@@ -133,51 +136,7 @@
     return rval;
 }
 
-#if 0
-void
-backtrace_symbols_fd(void *const *buffer, int size, int fd)
-{
-    int i, len, offset;
-    char *buf;
-    Dl_info info;
-
-    for (i = 0; i < size; i++) {
-        if (dladdr(buffer[i], &info) != 0) {
-            if (info.dli_sname == NULL)
-                info.dli_sname = "???";
-            if (info.dli_saddr == NULL)
-                info.dli_saddr = buffer[i];
-            offset = (const char *)buffer[i] - (const char *)info.dli_saddr;
-            /* "0x01234567 <function+offset> at filename" */
-            len = 2 +                      /* "0x" */
-                  (sizeof(void *) * 2) +   /* "01234567" */
-                  2 +                      /* " <" */
-                  strlen(info.dli_sname) + /* "function" */
-                  1 +                      /* "+" */
-                  D10(offset) +            /* "offset */
-                  5 +                      /* "> at " */
-                  strlen(info.dli_fname) + /* "filename" */
-                  2;                       /* "\n\0" */
-            buf = alloca(len);
-            if (buf == NULL)
-                return;
-            snprintf(buf, len, "%p <%s+%d> at %s\n",
-              buffer[i], info.dli_sname, offset, info.dli_fname);
-        } else {
-            len = 2 +                      /* "0x" */
-                  (sizeof(void *) * 2) +   /* "01234567" */
-                  2;                       /* "\n\0" */
-            buf = alloca(len);
-            if (buf == NULL)
-                return;
-            snprintf(buf, len, "%p\n", buffer[i]);
-        }
-        write(fd, buf, len - 1);
-    }
-}
-#endif
-
-void *
+static void *
 getreturnaddr(int level)
 {
 
@@ -314,7 +273,7 @@
     }
 }
 
-void *
+static void *
 getframeaddr(int level)
 {
 
@@ -450,3 +409,23 @@
     default: return NULL;
     }
 }
+
+#else
+
+int
+backtrace(void **buffer, int size)
+{
+	(void)buffer;
+	(void)size;
+	return (0);
+}
+
+char **
+backtrace_symbols(void *const *buffer, int size)
+{
+	(void)buffer;
+	(void)size;
+	return (0);
+}
+
+#endif



From phk at projects.linpro.no  Mon Nov 16 10:58:31 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 16 Nov 2009 11:58:31 +0100 (CET)
Subject: r4350 - trunk/varnish-cache/bin/varnishd
Message-ID: <20091116105831.25A1038D05@projects.linpro.no>

Author: phk
Date: 2009-11-16 11:58:30 +0100 (Mon, 16 Nov 2009)
New Revision: 4350

Modified:
   trunk/varnish-cache/bin/varnishd/flint.sh
Log:
Drag in /usr/local/include now that PCRE is required.



Modified: trunk/varnish-cache/bin/varnishd/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.sh	2009-11-16 09:35:09 UTC (rev 4349)
+++ trunk/varnish-cache/bin/varnishd/flint.sh	2009-11-16 10:58:30 UTC (rev 4350)
@@ -5,6 +5,7 @@
 	-I. \
 	-I../../include \
 	-I../.. \
+	-I/usr/local/include \
 	-DVARNISH_STATE_DIR=\"foo\" \
 	*.c \
 	../../lib/libvarnish/*.c \



From phk at projects.linpro.no  Mon Nov 16 12:44:03 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Mon, 16 Nov 2009 13:44:03 +0100 (CET)
Subject: r4351 - in trunk/varnish-cache/bin: varnishd varnishtest/tests
Message-ID: <20091116124403.A61F028138@projects.linpro.no>

Author: phk
Date: 2009-11-16 13:44:03 +0100 (Mon, 16 Nov 2009)
New Revision: 4351

Added:
   trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc
Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_esi.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/cache_response.c
   trunk/varnish-cache/bin/varnishd/stevedore.c
Log:
Rework ESI storage allocation.

Previously we stored the esi-metadata in the object workspace, but since we
are trying to make that a snug fit and we cannot preestimate how much space
ESI parsing will need, this no longer works.

Instead parse the ESI metadata into the workers workspace and when
done, allocate a storage object and move it all into that.

Beware that this may increase the memory cost for ESI objects by the stevedores
granularity.

Fixes #578



Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2009-11-16 10:58:30 UTC (rev 4350)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2009-11-16 12:44:03 UTC (rev 4351)
@@ -89,7 +89,7 @@
 struct objhead;
 struct objcore;
 struct workreq;
-struct esi_bit;
+struct esidata;
 struct vrt_backend;
 struct cli_proto;
 struct ban;
@@ -342,7 +342,7 @@
 
 	VTAILQ_HEAD(, storage)	store;
 
-	VTAILQ_HEAD(, esi_bit)	esibits;
+	struct esidata		*esidata;
 
 	double			last_use;
 

Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-11-16 10:58:30 UTC (rev 4350)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-11-16 12:44:03 UTC (rev 4351)
@@ -54,9 +54,8 @@
 #include "vrt.h"
 #include "vcl.h"
 #include "cache.h"
+#include "stevedore.h"
 
-#define NDEFELEM		10
-
 /*--------------------------------------------------------------------*/
 
 struct esi_bit {
@@ -65,11 +64,8 @@
 	txt			verbatim;
 	txt			host;
 	txt			include;
-	int			free_this;
 };
 
-VTAILQ_HEAD(esibithead, esi_bit);
-
 struct esi_ptr {
 	const char		*p;
 	const char              *e;
@@ -87,14 +83,24 @@
 
 	txt			t;
 	struct esi_bit		*eb;
-	struct esi_bit		*ebl;	/* list of */
-	int			neb;
 	int			remflg;	/* inside <esi:remove> </esi:remove> */
 	int			incmt;	/* inside <!--esi ... --> comment */
+
+	unsigned		space;	/* ... needed */
+
+	VTAILQ_HEAD(, esi_bit)	esibits;
+
 };
 
+struct esidata	{
+	unsigned		magic;
+#define ESIDATA_MAGIC		0x7255277f
+	VTAILQ_HEAD(, esi_bit)	esibits;
+	struct storage		*storage;
+};
+
 /*--------------------------------------------------------------------
- * Move the parse-pointer forward.
+ * Move an esi_ptr one char forward
  */
 
 static void
@@ -118,6 +124,10 @@
 	return;
 }
 
+/*--------------------------------------------------------------------
+ * Consume one input character.
+ */
+
 static void
 N(struct esi_work *ew)
 {
@@ -209,18 +219,12 @@
 esi_addbit(struct esi_work *ew, const char *verbatim, unsigned len)
 {
 
-	if (ew->neb == 0) {
-		ew->ebl = calloc(NDEFELEM, sizeof(struct esi_bit));
-		XXXAN(ew->ebl);
-		ew->neb = NDEFELEM;
-		ew->ebl->free_this = 1;
-	}
-	ew->eb = ew->ebl;
-	ew->ebl++;
-	ew->neb--;
+	ew->space += sizeof(*ew->eb);
+	ew->eb = (void*)WS_Alloc(ew->sp->wrk->ws, sizeof *ew->eb);
+	AN(ew->eb);
+	memset(ew->eb, 0, sizeof *ew->eb);
 
-
-	VTAILQ_INSERT_TAIL(&ew->sp->obj->esibits, ew->eb, list);
+	VTAILQ_INSERT_TAIL(&ew->esibits, ew->eb, list);
 	if (verbatim != NULL) {
 		ew->eb->verbatim.b = TRUST_ME(verbatim);
 		if (len > 0)
@@ -231,8 +235,10 @@
 			    Tlen(ew->eb->verbatim),
 			    Tlen(ew->eb->verbatim),
 			    ew->eb->verbatim.b);
-	} else
-		ew->eb->verbatim.b = ew->eb->verbatim.e = (void*)ew->eb;
+	} else {
+		AN(ew->s.p);
+		ew->eb->verbatim.b = ew->eb->verbatim.e = TRUST_ME(ew->s.p);
+	}
 }
 
 /*--------------------------------------------------------------------*/
@@ -381,12 +387,12 @@
 
 		if ( val.b != val.e ) {
 			s = Tlen(val) + 1;
-			c = WS_Alloc(ws, s);
+			c = WS_Alloc(ew->sp->wrk->ws, s);
 			XXXAN(c);
 			memcpy(c, val.b, Tlen(val));
 			val.b = c;
 			val.e = val.b + s;
-			*val.e = '\0';
+			val.e[-1] = '\0';
 		}
 
 		if (Tlen(val) > 7 && !memcmp(val.b, "http://", 7)) {
@@ -428,7 +434,7 @@
 			if (q != NULL)
 				tag.e = q + 1;
 
-			u = WS_Reserve(ws, 0);
+			u = WS_Reserve(ew->sp->wrk->ws, 0);
 			v = snprintf(ws->f, u - 1, "%.*s%.*s",
 			    pdiff(tag.b, tag.e), tag.b,
 			    pdiff(val.b, val.e), val.b);
@@ -436,8 +442,12 @@
 			xxxassert(v < u);
 			eb->include.b = ws->f;
 			eb->include.e = ws->f + v;
-			WS_Release(ws, v);
+			WS_Release(ew->sp->wrk->ws, v);
 		}
+		if (eb->include.b != NULL)
+			ew->space += Tlen(eb->include);
+		if (eb->host.b != NULL)
+			ew->space += Tlen(eb->host);
 	}
 }
 
@@ -654,6 +664,11 @@
 ESI_Parse(struct sess *sp)
 {
 	struct esi_work *ew, eww[1];
+	struct esi_bit *eb;
+	struct esidata *ed;
+	struct storage *st;
+	unsigned u;
+	char *hack;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
@@ -680,13 +695,19 @@
 	if (!contain_esi(sp->obj))
 		return;
 
+	/* XXX: debugging hack */
+	hack = sp->wrk->ws->f;
+
 	VSL_stats->esi_parse++;
 	/* XXX: only if GET ? */
 	ew = eww;
 	memset(eww, 0, sizeof eww);
+	VTAILQ_INIT(&ew->esibits);
 	ew->sp = sp;
 	ew->off = 1;
 
+	ew->space += sizeof(struct esidata);
+
 	ew->p.st = VTAILQ_FIRST(&sp->obj->store);
 	AN(ew->p.st);
 	ew->p.p = (char *)ew->p.st->ptr;
@@ -751,6 +772,48 @@
 	if (ew->incmt)
 		esi_error(ew, ew->t.e, -1,
 		    "ESI 1.0 unterminated <!--esi comment");
+
+	st = STV_alloc(sp, ew->space, sp->obj->objcore);
+	AN(st);
+	assert(st->space >= ew->space);
+
+	ed = (void*)st->ptr;
+	st->len += sizeof(*ed);
+	memset(ed, 0, sizeof *ed);
+	ed->magic = ESIDATA_MAGIC;
+	ed->storage = st;
+	VTAILQ_INIT(&ed->esibits);
+
+	while (!VTAILQ_EMPTY(&ew->esibits)) {
+		eb = VTAILQ_FIRST(&ew->esibits);
+		VTAILQ_REMOVE(&ew->esibits, eb, list);
+		memcpy(st->ptr + st->len, eb, sizeof *eb);
+		eb = (void*)(st->ptr + st->len);
+		st->len += sizeof(*eb);
+
+		if (eb->include.b != NULL) {
+			u = Tlen(eb->include);
+			memcpy(st->ptr + st->len, eb->include.b, u);
+			eb->include.b = (void*)(st->ptr + st->len);
+			eb->include.e = eb->include.b + u;
+			st->len += u;
+		}
+		if (eb->host.b != NULL) {
+			u = Tlen(eb->host);
+			memcpy(st->ptr + st->len, eb->host.b, u);
+			eb->host.b = (void*)(st->ptr + st->len);
+			eb->host.e = eb->host.b + u;
+			st->len += u;
+		}
+
+		VTAILQ_INSERT_TAIL(&ed->esibits, eb, list);
+	}
+
+	assert(st->len < st->space);
+	assert(st->len == ew->space);
+	sp->obj->esidata = ed;
+
+	memset(hack, 0xaa, sp->wrk->ws->f - hack);
 }
 
 /*--------------------------------------------------------------------*/
@@ -763,11 +826,14 @@
 	struct worker *w;
 	char *ws_wm;
 	struct http http_save;
+	struct esidata *ed;
 
 	w = sp->wrk;
 	WRW_Reserve(w, &sp->fd);
 	http_save.magic = 0;
-	VTAILQ_FOREACH(eb, &sp->obj->esibits, list) {
+	ed = sp->obj->esidata;
+	CHECK_OBJ_NOTNULL(ed, ESIDATA_MAGIC);
+	VTAILQ_FOREACH(eb, &ed->esibits, list) {
 		if (Tlen(eb->verbatim)) {
 			if (sp->http->protover >= 1.1)
 				(void)WRW_Write(w, eb->chunk_length, -1);
@@ -857,16 +923,10 @@
 void
 ESI_Destroy(struct object *o)
 {
-	struct esi_bit *eb;
+	struct esidata *ed;
 
-	/*
-	 * Delete esi_bits from behind and free(3) the ones that want to be.
-	 */
-	while (!VTAILQ_EMPTY(&o->esibits)) {
-		eb = VTAILQ_LAST(&o->esibits, esibithead);
-		VTAILQ_REMOVE(&o->esibits, eb, list);
-		if (eb->free_this)
-			free(eb);
-	}
+	ed = o->esidata;
+	o->esidata = NULL;
+	CHECK_OBJ_NOTNULL(ed, ESIDATA_MAGIC);
+	STV_free(ed->storage);
 }
-

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-16 10:58:30 UTC (rev 4350)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-16 12:44:03 UTC (rev 4351)
@@ -701,7 +701,8 @@
 	DSL(0x40, SLT_Debug, 0, "Object %u workspace min free %u",
 	    o->xid, WS_Free(o->ws_o));
 
-	ESI_Destroy(o);
+	if (o->esidata != NULL)
+		ESI_Destroy(o);
 	if (o->objcore != NULL && o->objcore->smp_seg != NULL) {
 		SMP_FreeObj(o);
 	} else {

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2009-11-16 10:58:30 UTC (rev 4350)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2009-11-16 12:44:03 UTC (rev 4351)
@@ -139,7 +139,7 @@
 	    HTTPH_A_DELIVER);
 
 	/* Only HTTP 1.1 can do Chunked encoding */
-	if (!sp->disable_esi && !VTAILQ_EMPTY(&sp->obj->esibits)) {
+	if (!sp->disable_esi && sp->obj->esidata != NULL) {
 		http_Unset(sp->wrk->resp, H_Content_Length);
 		if(sp->http->protover >= 1.1)
 			http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Transfer-Encoding: chunked");
@@ -178,7 +178,7 @@
 	if (sp->disable_esi || !sp->esis)
 		sp->acct_req.hdrbytes += http_Write(sp->wrk, sp->wrk->resp, 1);
 
-	if (!sp->disable_esi && sp->wantbody && !VTAILQ_EMPTY(&sp->obj->esibits)) {
+	if (!sp->disable_esi && sp->wantbody && sp->obj->esidata != NULL) {
 		if (WRW_FlushRelease(sp->wrk)) {
 			vca_close_session(sp, "remote closed");
 			return;

Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2009-11-16 10:58:30 UTC (rev 4350)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2009-11-16 12:44:03 UTC (rev 4351)
@@ -103,7 +103,6 @@
 	o->grace = NAN;
 	o->entered = NAN;
 	VTAILQ_INIT(&o->store);
-	VTAILQ_INIT(&o->esibits);
 	sp->wrk->stats.n_object++;
 }
 

Added: trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc	2009-11-16 12:44:03 UTC (rev 4351)
@@ -0,0 +1,88 @@
+# $Id: e00003.vtc 3742 2009-02-11 07:53:47Z tfheen $
+
+test "Aggressive use of ESI include"
+
+
+server s1 {
+	rxreq 
+	txresp -body {
+		<html>
+		Before include
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/00"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/01"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/02"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/03"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/04"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/05"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/06"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/07"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/08"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/09"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/10"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/11"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/12"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/13"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/14"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/15"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/16"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/17"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/18"/>
+		<esi:include src="/some/very/long/url/with/dozen/of/information/for/esi/subquery/to/munch/and/also/to/try/to/make/object/workspace/explode/by/dumping/a/core/in/some/obscure/directory/on/my/file/system/19"/>
+		After include
+	}
+	rxreq 
+	txresp -body { Included file 00 }
+	rxreq 
+	txresp -body { Included file 01 }
+	rxreq 
+	txresp -body { Included file 02 }
+	rxreq 
+	txresp -body { Included file 03 }
+	rxreq 
+	txresp -body { Included file 04 }
+	rxreq 
+	txresp -body { Included file 05 }
+	rxreq 
+	txresp -body { Included file 06 }
+	rxreq
+	txresp -body { Included file 07 }
+	rxreq 
+	txresp -body { Included file 08 }
+	rxreq 
+	txresp -body { Included file 09 }
+	rxreq 
+	txresp -body { Included file 10 }
+	rxreq 
+	txresp -body { Included file 11 }
+	rxreq 
+	txresp -body { Included file 12 }
+	rxreq 
+	txresp -body { Included file 13 }
+	rxreq 
+	txresp -body { Included file 14 }
+	rxreq 
+	txresp -body { Included file 15 }
+	rxreq 
+	txresp -body { Included file 16 }
+	rxreq
+	txresp -body { Included file 17 }
+	rxreq 
+	txresp -body { Included file 18 }
+	rxreq 
+	txresp -body { Included file 19 }
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_fetch {
+		esi;
+	}
+} -start
+
+client c1 {
+	txreq 
+	rxresp
+	expect resp.status == 200
+}
+
+client c1 -run
+varnish v1 -expect esi_errors == 0



From phk at projects.linpro.no  Wed Nov 18 12:34:39 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 18 Nov 2009 13:34:39 +0100 (CET)
Subject: r4352 - trunk/varnish-cache/bin/varnishd
Message-ID: <20091118123439.6A18C38D0D@projects.linpro.no>

Author: phk
Date: 2009-11-18 13:34:39 +0100 (Wed, 18 Nov 2009)
New Revision: 4352

Modified:
   trunk/varnish-cache/bin/varnishd/cache_pool.c
   trunk/varnish-cache/bin/varnishd/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt_pool.c
Log:
Add a parameter to set the workerthread stacksize.

On 32 bit systems, it may be necessary to tweak this down to get high
numbers of worker threads squeezed into the address-space.

I have no idea how much stack-space a worker thread normally uses, so
no guidance is given, and we default to the system default.

Fixes #572


Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-11-16 12:44:03 UTC (rev 4351)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-11-18 12:34:39 UTC (rev 4352)
@@ -432,7 +432,7 @@
  */
 
 static void
-wrk_breed_flock(struct wq *qp)
+wrk_breed_flock(struct wq *qp, const pthread_attr_t *tp_attr)
 {
 	pthread_t tp;
 
@@ -445,7 +445,7 @@
 	    qp->nqueue > qp->lqueue)) {	/* not getting better since last */
 		if (qp->nthr >= nthr_max) {
 			VSL_stats->n_wrk_max++;
-		} else if (pthread_create(&tp, NULL, wrk_thread, qp)) {
+		} else if (pthread_create(&tp, tp_attr, wrk_thread, qp)) {
 			VSL(SLT_Debug, 0, "Create worker thread failed %d %s",
 			    errno, strerror(errno));
 			VSL_stats->n_wrk_failed++;
@@ -476,17 +476,27 @@
 wrk_herder_thread(void *priv)
 {
 	unsigned u, w;
+	pthread_attr_t tp_attr; 
 
+	/* Set the stacksize for worker threads */ 
+	AZ(pthread_attr_init(&tp_attr));
+
 	THR_SetName("wrk_herder");
 	(void)priv;
 	while (1) {
 		for (u = 0 ; u < nwq; u++) {
+			if (params->wthread_stacksize != UINT_MAX)
+				AZ(pthread_attr_setstacksize(&tp_attr,
+				    params->wthread_stacksize)); 
+
+			wrk_breed_flock(wq[u], &tp_attr);
+
 			/*
 			 * Make sure all pools have their minimum complement
 			 */
 			for (w = 0 ; w < nwq; w++)
 				while (wq[w]->nthr < params->wthread_min)
-					wrk_breed_flock(wq[w]);
+					wrk_breed_flock(wq[w], &tp_attr);
 			/*
 			 * We cannot avoid getting a mutex, so we have a
 			 * bogo mutex just for POSIX_STUPIDITY
@@ -494,7 +504,6 @@
 			Lck_Lock(&herder_mtx);
 			Lck_CondWait(&herder_cond, &herder_mtx);
 			Lck_Unlock(&herder_mtx);
-			wrk_breed_flock(wq[u]);
 		}
 	}
 	NEEDLESS_RETURN(NULL);

Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-16 12:44:03 UTC (rev 4351)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-18 12:34:39 UTC (rev 4352)
@@ -93,6 +93,7 @@
 	unsigned		wthread_fail_delay;
 	unsigned		wthread_purge_delay;
 	unsigned		wthread_stats_rate;
+	unsigned		wthread_stacksize;
 
 	unsigned		overflow_max;
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_pool.c	2009-11-16 12:44:03 UTC (rev 4351)
+++ trunk/varnish-cache/bin/varnishd/mgt_pool.c	2009-11-18 12:34:39 UTC (rev 4352)
@@ -190,6 +190,13 @@
 		"number of worker threads.  ",
 		EXPERIMENTAL,
 		"3", "requests per request" },
+	{ "thread_pool_stack",
+		tweak_uint, &master.wthread_stacksize, 64*1024, UINT_MAX,
+		"Worker thread stack size.  In particular on 32bit systems "
+		"you may need to tweak this down to fit many threads into "
+		"the limited address space.\n",
+		EXPERIMENTAL,
+		"-1", "bytes" },
 	{ NULL, NULL, NULL }
 };
 



From phk at projects.linpro.no  Wed Nov 18 12:46:48 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 18 Nov 2009 13:46:48 +0100 (CET)
Subject: r4353 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091118124648.3F95D1F73FF@projects.linpro.no>

Author: phk
Date: 2009-11-18 13:46:47 +0100 (Wed, 18 Nov 2009)
New Revision: 4353

Added:
   trunk/varnish-cache/bin/varnishtest/tests/c00031.vtc
Log:
Add test case for setting stacksize of worker thread



Added: trunk/varnish-cache/bin/varnishtest/tests/c00031.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00031.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00031.vtc	2009-11-18 12:46:47 UTC (rev 4353)
@@ -0,0 +1,19 @@
+# Test that we get anything through at all
+#
+# $Id: c00002.vtc 3053 2008-08-01 09:22:21Z phk $
+
+test "Worker thread stack size setting"
+
+server s1 {
+	rxreq 
+	txresp
+} -start
+
+varnish v1 -arg "-p thread_pool_stack=131072" -vcl+backend {} -start
+
+client c1 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 200
+} -run
+



From phk at projects.linpro.no  Wed Nov 18 19:05:07 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 18 Nov 2009 20:05:07 +0100 (CET)
Subject: r4354 - trunk/varnish-cache/bin/varnishd
Message-ID: <20091118190507.6B1D538175@projects.linpro.no>

Author: phk
Date: 2009-11-18 20:05:07 +0100 (Wed, 18 Nov 2009)
New Revision: 4354

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Document -C option in usage.

Fixes #559



Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2009-11-18 12:46:47 UTC (rev 4353)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2009-11-18 19:05:07 UTC (rev 4354)
@@ -180,6 +180,7 @@
 	fprintf(stderr, FMT, "-b address:port", "backend address and port");
 	fprintf(stderr, FMT, "", "   -b <hostname_or_IP>");
 	fprintf(stderr, FMT, "", "   -b '<hostname_or_IP>:<port_or_service>'");
+	fprintf(stderr, FMT, "-C", "print VCL code compiled to C language");
 	fprintf(stderr, FMT, "-d", "debug");
 	fprintf(stderr, FMT, "-f file", "VCL script");
 	fprintf(stderr, FMT, "-F", "Run in foreground");



From phk at projects.linpro.no  Wed Nov 18 19:54:32 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 18 Nov 2009 20:54:32 +0100 (CET)
Subject: r4355 - trunk/varnish-cache/bin/varnishd
Message-ID: <20091118195432.5A0281F740B@projects.linpro.no>

Author: phk
Date: 2009-11-18 20:54:32 +0100 (Wed, 18 Nov 2009)
New Revision: 4355

Modified:
   trunk/varnish-cache/bin/varnishd/storage_persistent.c
Log:
Close a race that demonstrates that I have no idea what kind of load
my users have:

Do not load new segments opened after we started, even if multiple such
have been created, before we finish loading the old segments from the
silo.

Fixes	#564




Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-11-18 19:05:07 UTC (rev 4354)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-11-18 19:54:32 UTC (rev 4355)
@@ -99,6 +99,8 @@
 
 	struct smp_segptr	p;
 
+	unsigned		must_load;
+
 	uint32_t		nobj;		/* Number of objects */
 	uint32_t		nalloc;		/* Allocations */
 	uint32_t		nalloc1;	/* Allocated objects */
@@ -884,7 +886,11 @@
 	struct smp_signctx ctx[1];
 
 	ASSERT_SILO_THREAD(sc);
-	(void)sp;
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	CHECK_OBJ_NOTNULL(sg, SMP_SEG_MAGIC);
+	CHECK_OBJ_NOTNULL(sg->lru, LRU_MAGIC);
+	assert(sg->must_load == 1);
+	sg->must_load = 0;
 	AN(sg->p.offset);
 	if (sg->p.objlist == 0)
 		return;
@@ -1005,7 +1011,11 @@
 		ALLOC_OBJ(sg, SMP_SEG_MAGIC);
 		AN(sg);
 		sg->lru = LRU_Alloc();
+		CHECK_OBJ_NOTNULL(sg->lru, LRU_MAGIC);
 		sg->p = *ss;
+
+		sg->must_load = 1;
+
 		/*
 		 * HACK: prevent save_segs from nuking segment until we have
 		 * HACK: loaded it.
@@ -1052,6 +1062,8 @@
 	ALLOC_OBJ(sg, SMP_SEG_MAGIC);
 	AN(sg);
 	sg->sc = sc;
+	sg->lru = LRU_Alloc();
+	CHECK_OBJ_NOTNULL(sg->lru, LRU_MAGIC);
 
 	AN(sc->objbuf);
 	sg->objs = sc->objbuf;
@@ -1189,7 +1201,8 @@
 
 	/* First, load all the objects from all segments */
 	VTAILQ_FOREACH(sg, &sc->segments, list)
-		smp_load_seg(sp, sc, sg);
+		if (sg->must_load)
+			smp_load_seg(sp, sc, sg);
 
 	sc->flags |= SMP_F_LOADED;
 	BAN_Deref(&sc->tailban);



From phk at projects.linpro.no  Thu Nov 19 11:40:23 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Thu, 19 Nov 2009 12:40:23 +0100 (CET)
Subject: r4356 - in trunk/varnish-cache: bin/varnishd bin/varnishtest/tests
	include lib/libvcl
Message-ID: <20091119114023.6F6BE1F741F@projects.linpro.no>

Author: phk
Date: 2009-11-19 12:40:23 +0100 (Thu, 19 Nov 2009)
New Revision: 4356

Modified:
   trunk/varnish-cache/bin/varnishd/cache_backend_poll.c
   trunk/varnish-cache/bin/varnishd/cache_backend_poll.h
   trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
   trunk/varnish-cache/include/vrt.h
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Don't halfclose the backend polling TCP connection after sending the
request, some backends gets confused by this.

Add a ".status" to backend polling, to configure the expected HTTP
status code for a good poll.

Fixes #584



Modified: trunk/varnish-cache/bin/varnishd/cache_backend_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_poll.c	2009-11-19 11:40:23 UTC (rev 4356)
@@ -174,23 +174,6 @@
 	}
 	vt->good_xmit |= 1;
 
-	/* And do a shutdown(WR) so we know that the backend got it */
-	i = shutdown(s, SHUT_WR);
-	if (i != 0) {
-		vt->err_shut |= 1;
-		TCP_close(&s);
-		return;
-	}
-	vt->good_shut |= 1;
-
-	/* Check if that took too long time */
-	t_now = TIM_real();
-	tmo = (int)round((t_end - t_now) * 1e3);
-	if (tmo < 0) {
-		TCP_close(&s);
-		return;
-	}
-
 	pfd->fd = s;
 	rlen = 0;
 	do {
@@ -237,7 +220,7 @@
 
 	i = sscanf(vt->resp_buf, "HTTP/%*f %u %s", &resp, buf);
 
-	if (i == 2 && resp == 200)
+	if (i == 2 && resp == vt->probe.exp_status)
 		vt->happy |= 1;
 }
 
@@ -336,6 +319,8 @@
 		vt->probe.window = 8;
 	if (vt->probe.threshold == 0)
 		vt->probe.threshold = 3;
+	if (vt->probe.exp_status == 0)
+		vt->probe.exp_status = 200;
 
 	if (vt->probe.threshold == ~0U)
 		vt->probe.initial = vt->probe.threshold - 1;

Modified: trunk/varnish-cache/bin/varnishd/cache_backend_poll.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_poll.h	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_poll.h	2009-11-19 11:40:23 UTC (rev 4356)
@@ -33,8 +33,6 @@
 BITMAP(good_ipv6, '6', "Good IPv6", 0)
 BITMAP( err_xmit, 'x', "Error Xmit", 0)
 BITMAP(good_xmit, 'X', "Good Xmit", 0)
-BITMAP( err_shut, 's', "Error Shut", 0)
-BITMAP(good_shut, 'S', "Good Shut", 0)
 BITMAP( err_recv, 'r', "Error Recv", 0)
 BITMAP(good_recv, 'R', "Good Recv", 0)
 BITMAP(happy,     'H', "Happy", 1)

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-19 11:40:23 UTC (rev 4356)
@@ -185,3 +185,11 @@
 	}
 }
 
+
+varnish v1 -badvcl {
+	backend b1 {
+		.host = "127.0.0.1";
+		.probe = { .status = 13; }
+	}
+}
+

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-19 11:40:23 UTC (rev 4356)
@@ -2,6 +2,16 @@
 
 test "VCL: test backend probe syntax"
 
+# Check status definition
+varnish v1 -vcl {
+	backend b1 {
+		.host = "127.0.0.1";
+		.probe = {
+			.status = 204;
+		}
+	}
+}
+
 # Check url definition
 varnish v1 -vcl {
 	backend b1 {

Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/include/vrt.h	2009-11-19 11:40:23 UTC (rev 4356)
@@ -52,6 +52,7 @@
 	const char	*request;
 	double		timeout;
 	double		interval;
+	unsigned	exp_status;
 	unsigned	window;
 	unsigned	threshold;
 	unsigned	initial;

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 11:40:23 UTC (rev 4356)
@@ -343,11 +343,12 @@
 	struct token *t_field;
 	struct token *t_did = NULL, *t_window = NULL, *t_threshold = NULL;
 	struct token *t_initial = NULL;
-	unsigned window, threshold, initial;
+	unsigned window, threshold, initial, status;
 
 	fs = vcc_FldSpec(tl,
 	    "?url",
 	    "?request",
+	    "?status",
 	    "?timeout",
 	    "?interval",
 	    "?window",
@@ -361,6 +362,7 @@
 	window = 0;
 	threshold = 0;
 	initial = 0;
+	status = 0;
 	Fb(tl, 0, "\t.probe = {\n");
 	while (tl->t->tok != '}') {
 
@@ -406,6 +408,17 @@
 			initial = vcc_UintVal(tl);
 			vcc_NextToken(tl);
 			ERRCHK(tl);
+		} else if (vcc_IdIs(t_field, "status")) {
+			status = vcc_UintVal(tl);
+			if (status < 100 || status > 999) {
+				vsb_printf(tl->sb,
+				    "Must specify .status with exactly three "
+				    " digits (100 <= x <= 999)\n");
+				vcc_ErrWhere(tl, tl->t);
+				return;
+			}
+			vcc_NextToken(tl);
+			ERRCHK(tl);
 		} else if (vcc_IdIs(t_field, "threshold")) {
 			t_threshold = tl->t;
 			threshold = vcc_UintVal(tl);
@@ -457,6 +470,8 @@
 		Fb(tl, 0, "\t\t.initial = %u,\n", initial);
 	else
 		Fb(tl, 0, "\t\t.initial = ~0U,\n", initial);
+	if (status > 0)
+		Fb(tl, 0, "\t\t.exp_status = %u,\n", status);
 	Fb(tl, 0, "\t},\n");
 	ExpectErr(tl, '}');
 	vcc_NextToken(tl);

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-19 11:40:23 UTC (rev 4356)
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08:47:03Z phk $
  *
  * NB:  This file is machine generated, DO NOT EDIT!
  *
@@ -159,9 +159,10 @@
 
 	/* ../../include/vcl.h */
 
-	vsb_cat(sb, "/*\n * $Id$\n *\n * NB:  This file is machine generate");
-	vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
-	vsb_cat(sb, "en.tcl instead\n */\n\nstruct sess;\n");
+	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08");
+	vsb_cat(sb, ":47:03Z phk $\n *\n * NB:  This file is machine genera");
+	vsb_cat(sb, "ted, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_t");
+	vsb_cat(sb, "oken.tcl instead\n */\n\nstruct sess;\n");
 	vsb_cat(sb, "struct cli;\n\ntypedef void vcl_init_f(struct cli *);\n");
 	vsb_cat(sb, "typedef void vcl_fini_f(struct cli *);\n");
 	vsb_cat(sb, "typedef int vcl_func_f(struct sess *sp);\n");
@@ -227,25 +228,25 @@
 	vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
 	vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
 	vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
-	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id$\n *\n");
-	vsb_cat(sb, " * Runtime support for compiled VCL programs.\n");
-	vsb_cat(sb, " *\n * XXX: When this file is changed, lib/libvcl/vcc_");
-	vsb_cat(sb, "gen_fixed_token.tcl\n * XXX: *MUST* be rerun.\n");
-	vsb_cat(sb, " */\n\nstruct sess;\nstruct vsb;\n");
-	vsb_cat(sb, "struct cli;\nstruct director;\n");
-	vsb_cat(sb, "struct VCL_conf;\nstruct sockaddr;\n");
-	vsb_cat(sb, "\n/*\n * A backend probe specification\n");
-	vsb_cat(sb, " */\n\nextern const void * const vrt_magic_string_end;");
-	vsb_cat(sb, "\n\nstruct vrt_backend_probe {\n");
+	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4336 2009-10-21 11:");
+	vsb_cat(sb, "36:28Z kristian $\n *\n * Runtime support for compiled");
+	vsb_cat(sb, " VCL programs.\n *\n * XXX: When this file is changed,");
+	vsb_cat(sb, " lib/libvcl/vcc_gen_fixed_token.tcl\n");
+	vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");
+	vsb_cat(sb, "\nstruct sess;\nstruct vsb;\nstruct cli;\n");
+	vsb_cat(sb, "struct director;\nstruct VCL_conf;\n");
+	vsb_cat(sb, "struct sockaddr;\n\n/*\n * A backend probe specificati");
+	vsb_cat(sb, "on\n */\n\nextern const void * const vrt_magic_string_");
+	vsb_cat(sb, "end;\n\nstruct vrt_backend_probe {\n");
 	vsb_cat(sb, "\tconst char\t*url;\n\tconst char\t*request;\n");
 	vsb_cat(sb, "\tdouble\t\ttimeout;\n\tdouble\t\tinterval;\n");
-	vsb_cat(sb, "\tunsigned\twindow;\n\tunsigned\tthreshold;\n");
-	vsb_cat(sb, "\tunsigned\tinitial;\n};\n\n/*\n");
-	vsb_cat(sb, " * A backend is a host+port somewhere on the network\n");
-	vsb_cat(sb, " */\nstruct vrt_backend {\n\tconst char\t\t\t*vcl_name");
-	vsb_cat(sb, ";\n\tconst char\t\t\t*ident;\n\n");
-	vsb_cat(sb, "\tconst char\t\t\t*hosthdr;\n\n");
-	vsb_cat(sb, "\tconst unsigned char\t\t*ipv4_sockaddr;\n");
+	vsb_cat(sb, "\tunsigned\texp_status;\n\tunsigned\twindow;\n");
+	vsb_cat(sb, "\tunsigned\tthreshold;\n\tunsigned\tinitial;\n");
+	vsb_cat(sb, "};\n\n/*\n * A backend is a host+port somewhere on the");
+	vsb_cat(sb, " network\n */\nstruct vrt_backend {\n");
+	vsb_cat(sb, "\tconst char\t\t\t*vcl_name;\n\tconst char\t\t\t*ident");
+	vsb_cat(sb, ";\n\n\tconst char\t\t\t*hosthdr;\n");
+	vsb_cat(sb, "\n\tconst unsigned char\t\t*ipv4_sockaddr;\n");
 	vsb_cat(sb, "\tconst unsigned char\t\t*ipv6_sockaddr;\n");
 	vsb_cat(sb, "\n\tdouble\t\t\t\tconnect_timeout;\n");
 	vsb_cat(sb, "\tdouble\t\t\t\tfirst_byte_timeout;\n");
@@ -318,25 +319,26 @@
 
 	/* ../../include/vrt_obj.h */
 
-	vsb_cat(sb, "/*\n * $Id$\n *\n * NB:  This file is machine generate");
-	vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
-	vsb_cat(sb, "en.tcl instead\n */\n\nstruct sockaddr * VRT_r_client_");
-	vsb_cat(sb, "ip(const struct sess *);\nstruct sockaddr * VRT_r_serv");
-	vsb_cat(sb, "er_ip(struct sess *);\nconst char * VRT_r_server_hostn");
-	vsb_cat(sb, "ame(struct sess *);\nconst char * VRT_r_server_identit");
-	vsb_cat(sb, "y(struct sess *);\nint VRT_r_server_port(struct sess *");
-	vsb_cat(sb, ");\nconst char * VRT_r_req_request(const struct sess *");
-	vsb_cat(sb, ");\nvoid VRT_l_req_request(const struct sess *, const ");
-	vsb_cat(sb, "char *, ...);\nconst char * VRT_r_req_url(const struct");
-	vsb_cat(sb, " sess *);\nvoid VRT_l_req_url(const struct sess *, con");
-	vsb_cat(sb, "st char *, ...);\nconst char * VRT_r_req_proto(const s");
-	vsb_cat(sb, "truct sess *);\nvoid VRT_l_req_proto(const struct sess");
-	vsb_cat(sb, " *, const char *, ...);\nvoid VRT_l_req_hash(struct se");
-	vsb_cat(sb, "ss *, const char *);\nstruct director * VRT_r_req_back");
-	vsb_cat(sb, "end(struct sess *);\nvoid VRT_l_req_backend(struct ses");
-	vsb_cat(sb, "s *, struct director *);\nint VRT_r_req_restarts(const");
-	vsb_cat(sb, " struct sess *);\ndouble VRT_r_req_grace(struct sess *");
-	vsb_cat(sb, ");\nvoid VRT_l_req_grace(struct sess *, double);\n");
+	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08");
+	vsb_cat(sb, ":47:03Z phk $\n *\n * NB:  This file is machine genera");
+	vsb_cat(sb, "ted, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_t");
+	vsb_cat(sb, "oken.tcl instead\n */\n\nstruct sockaddr * VRT_r_clien");
+	vsb_cat(sb, "t_ip(const struct sess *);\nstruct sockaddr * VRT_r_se");
+	vsb_cat(sb, "rver_ip(struct sess *);\nconst char * VRT_r_server_hos");
+	vsb_cat(sb, "tname(struct sess *);\nconst char * VRT_r_server_ident");
+	vsb_cat(sb, "ity(struct sess *);\nint VRT_r_server_port(struct sess");
+	vsb_cat(sb, " *);\nconst char * VRT_r_req_request(const struct sess");
+	vsb_cat(sb, " *);\nvoid VRT_l_req_request(const struct sess *, cons");
+	vsb_cat(sb, "t char *, ...);\nconst char * VRT_r_req_url(const stru");
+	vsb_cat(sb, "ct sess *);\nvoid VRT_l_req_url(const struct sess *, c");
+	vsb_cat(sb, "onst char *, ...);\nconst char * VRT_r_req_proto(const");
+	vsb_cat(sb, " struct sess *);\nvoid VRT_l_req_proto(const struct se");
+	vsb_cat(sb, "ss *, const char *, ...);\nvoid VRT_l_req_hash(struct ");
+	vsb_cat(sb, "sess *, const char *);\nstruct director * VRT_r_req_ba");
+	vsb_cat(sb, "ckend(struct sess *);\nvoid VRT_l_req_backend(struct s");
+	vsb_cat(sb, "ess *, struct director *);\nint VRT_r_req_restarts(con");
+	vsb_cat(sb, "st struct sess *);\ndouble VRT_r_req_grace(struct sess");
+	vsb_cat(sb, " *);\nvoid VRT_l_req_grace(struct sess *, double);\n");
 	vsb_cat(sb, "const char * VRT_r_req_xid(struct sess *);\n");
 	vsb_cat(sb, "unsigned VRT_r_req_esi(struct sess *);\n");
 	vsb_cat(sb, "void VRT_l_req_esi(struct sess *, unsigned);\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-18 19:54:32 UTC (rev 4355)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-19 11:40:23 UTC (rev 4356)
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08:47:03Z phk $
  *
  * NB:  This file is machine generated, DO NOT EDIT!
  *



From phk at projects.linpro.no  Thu Nov 19 12:00:13 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Thu, 19 Nov 2009 13:00:13 +0100 (CET)
Subject: r4357 - in trunk/varnish-cache: bin/varnishtest/tests lib/libvcl
Message-ID: <20091119120013.3BAEE1F7420@projects.linpro.no>

Author: phk
Date: 2009-11-19 13:00:12 +0100 (Thu, 19 Nov 2009)
New Revision: 4357

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
Log:
.expected_response is a better idea than .status

Tip o' the hat to: tfheen



Modified: trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-19 12:00:12 UTC (rev 4357)
@@ -189,7 +189,7 @@
 varnish v1 -badvcl {
 	backend b1 {
 		.host = "127.0.0.1";
-		.probe = { .status = 13; }
+		.probe = { .expected_response = 13; }
 	}
 }
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-19 12:00:12 UTC (rev 4357)
@@ -7,7 +7,7 @@
 	backend b1 {
 		.host = "127.0.0.1";
 		.probe = {
-			.status = 204;
+			.expected_response = 204;
 		}
 	}
 }

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 12:00:12 UTC (rev 4357)
@@ -348,7 +348,7 @@
 	fs = vcc_FldSpec(tl,
 	    "?url",
 	    "?request",
-	    "?status",
+	    "?expected_response",
 	    "?timeout",
 	    "?interval",
 	    "?window",
@@ -408,7 +408,7 @@
 			initial = vcc_UintVal(tl);
 			vcc_NextToken(tl);
 			ERRCHK(tl);
-		} else if (vcc_IdIs(t_field, "status")) {
+		} else if (vcc_IdIs(t_field, "expected_response")) {
 			status = vcc_UintVal(tl);
 			if (status < 100 || status > 999) {
 				vsb_printf(tl->sb,



From phk at projects.linpro.no  Thu Nov 19 19:03:26 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Thu, 19 Nov 2009 20:03:26 +0100 (CET)
Subject: r4358 - in trunk/varnish-cache: bin/varnishd bin/varnishstat
	bin/varnishtest bin/varnishtop include include/compat
	lib/libjemalloc lib/libvarnish lib/libvarnishcompat lib/libvcl
Message-ID: <20091119190326.6262D1F73D7@projects.linpro.no>

Author: phk
Date: 2009-11-19 20:03:25 +0100 (Thu, 19 Nov 2009)
New Revision: 4358

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/cache_ban.h
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_cli.c
   trunk/varnish-cache/bin/varnishd/cache_esi.c
   trunk/varnish-cache/bin/varnishd/cache_expire.c
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/cache_http.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_vrt.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/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/bin/varnishd/mgt_param.c
   trunk/varnish-cache/bin/varnishd/mgt_vcc.c
   trunk/varnish-cache/bin/varnishd/shmlog.c
   trunk/varnish-cache/bin/varnishd/stevedore.c
   trunk/varnish-cache/bin/varnishd/stevedore.h
   trunk/varnish-cache/bin/varnishd/storage_persistent.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
   trunk/varnish-cache/bin/varnishstat/varnishstat.c
   trunk/varnish-cache/bin/varnishtest/vtc.c
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
   trunk/varnish-cache/bin/varnishtop/varnishtop.c
   trunk/varnish-cache/include/cli.h
   trunk/varnish-cache/include/compat/daemon.h
   trunk/varnish-cache/include/http_headers.h
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/include/persistent.h
   trunk/varnish-cache/include/purge_vars.h
   trunk/varnish-cache/include/stat_field.h
   trunk/varnish-cache/include/vqueue.h
   trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
   trunk/varnish-cache/lib/libvarnish/binary_heap.c
   trunk/varnish-cache/lib/libvarnish/subproc.c
   trunk/varnish-cache/lib/libvarnish/tcp.c
   trunk/varnish-cache/lib/libvarnish/vlu.c
   trunk/varnish-cache/lib/libvarnish/vsha256.c
   trunk/varnish-cache/lib/libvarnishcompat/execinfo.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_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
   trunk/varnish-cache/lib/libvcl/vcc_obj.c
   trunk/varnish-cache/lib/libvcl/vcc_xref.c
Log:
White-space cleanup megacommit.



Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -284,7 +284,7 @@
 	struct object		*obj;
 	struct objhead		*objhead;
 	double			timer_when;
-	unsigned 		flags;
+	unsigned		flags;
 #define OC_F_ONLRU		(1<<0)
 #define OC_F_BUSY		(1<<1)
 #define OC_F_PASS		(1<<2)
@@ -472,7 +472,8 @@
 
 /* cache_ban.c */
 struct ban *BAN_New(void);
-int BAN_AddTest(struct cli *, struct ban *, const char *, const char *, const char *);
+int BAN_AddTest(struct cli *, struct ban *, const char *, const char *,
+    const char *);
 void BAN_Free(struct ban *b);
 void BAN_Insert(struct ban *b);
 void BAN_Init(void);
@@ -607,7 +608,8 @@
 #endif  /* SENDFILE_WORKS */
 
 typedef void *bgthread_t(struct sess *, void *priv);
-void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func, void *priv);
+void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func,
+    void *priv);
 
 /* cache_session.c [SES] */
 void SES_Init(void);

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -35,7 +35,7 @@
  *	req.url ~ ".iso" && obj.size > 10MB
  *	req.http.host ~ "web1.com" && obj.set-cookie ~ "USER=29293"
  *
- * We make the "&&" mandatory from the start, leaving the syntax space 
+ * We make the "&&" mandatory from the start, leaving the syntax space
  * for latter handling of "||" as well.
  *
  */
@@ -243,7 +243,8 @@
 };
 
 int
-BAN_AddTest(struct cli *cli, struct ban *b, const char *a1, const char *a2, const char *a3)
+BAN_AddTest(struct cli *cli, struct ban *b, const char *a1, const char *a2,
+    const char *a3)
 {
 	struct ban_test *bt;
 	const struct pvar *pv;
@@ -289,7 +290,7 @@
 		bt->func = pv->func;
 		if (pv->flag & PVAR_REQ)
 			b->flags |= BAN_F_REQ;
-		if (pv->flag & PVAR_HTTP) 
+		if (pv->flag & PVAR_HTTP)
 			ban_parse_http(bt, a1 + strlen(pv->name));
 		break;
 	}
@@ -531,7 +532,7 @@
 		oc = NULL;
 		while (1) {
 			b = VTAILQ_LAST(&ban_head, banhead);
-			if (b == ban_start) 
+			if (b == ban_start)
 				break;
 			oc = VTAILQ_FIRST(&b->objcore);
 			if (oc == NULL)

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -33,7 +33,8 @@
 struct ban_test;
 
 /* A ban-testing function */
-typedef int ban_cond_f(const struct ban_test *bt, const struct object *o, const struct sess *sp);
+typedef int ban_cond_f(const struct ban_test *bt, const struct object *o,
+    const struct sess *sp);
 
 /* Each individual test to be performed on a ban */
 struct ban_test {

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -123,7 +123,7 @@
 		else if (i == -1 && Tlen(sp->htc->rxbuf) == 0 &&
 		    (errno == 0 || errno == ECONNRESET))
 			vca_close_session(sp, "EOF");
-		else 
+		else
 			vca_close_session(sp, "error");
 		sp->step = STP_DONE;
 	}
@@ -256,7 +256,7 @@
 	sp->t_resp = NAN;
 	WSL_Flush(sp->wrk, 0);
 
-	/* If we did an ESI include, don't mess up our state */ 
+	/* If we did an ESI include, don't mess up our state */
 	if (sp->esis > 0) {
 		SES_Charge(sp);
 		return (1);
@@ -266,7 +266,7 @@
 
 	if (sp->fd >= 0 && sp->doclose != NULL) {
 		/*
-		 * This is an orderly close of the connection; ditch nolinger 
+		 * This is an orderly close of the connection; ditch nolinger
 		 * before we close, to get queued data transmitted.
 		 */
 		TCP_linger(sp->fd, 0);
@@ -282,7 +282,7 @@
 		return (1);
 	}
 
-	if (sp->wrk->stats.client_req >= params->wthread_stats_rate) 
+	if (sp->wrk->stats.client_req >= params->wthread_stats_rate)
 		WRK_SumStat(sp->wrk);
 	/* Reset the workspace to the session-watermark */
 	WS_Reset(sp->ws, sp->ws_ses);
@@ -361,7 +361,8 @@
 		    http_StatusMessage(sp->err_code));
 	VCL_error_method(sp);
 
-	if (sp->handling == VCL_RET_RESTART && sp->restarts <  params->max_restarts) {
+	if (sp->handling == VCL_RET_RESTART &&
+	    sp->restarts <  params->max_restarts) {
 		HSH_Drop(sp);
 		sp->director = NULL;
 		sp->restarts++;
@@ -369,8 +370,8 @@
 		return (0);
 	} else if (sp->handling == VCL_RET_RESTART)
 		sp->handling = VCL_RET_DELIVER;
-		  
 
+
 	/* We always close when we take this path */
 	sp->doclose = "error";
 	sp->wantbody = 1;
@@ -534,7 +535,7 @@
 	/*
 	 * XXX: If we have a Length: header, we should allocate the body
 	 * XXX: also.
- 	 */
+	 */
 
 	sp->obj = STV_NewObject(sp, l, sp->wrk->ttl);
 
@@ -563,7 +564,7 @@
 	sp->obj->cacheable = sp->wrk->cacheable;
 	sp->obj->ttl = sp->wrk->ttl;
 	sp->obj->grace = sp->wrk->grace;
-	if (sp->obj->ttl == 0. && sp->obj->grace == 0.)		
+	if (sp->obj->ttl == 0. && sp->obj->grace == 0.)
 		sp->obj->cacheable = 0;
 	sp->obj->age = sp->wrk->age;
 	sp->obj->entered = sp->wrk->entered;
@@ -580,7 +581,7 @@
 
 	if (http_GetHdr(hp, H_Last_Modified, &b))
 		sp->obj->last_modified = TIM_parse(b);
-	
+
 	i = FetchBody(sp);
 	AZ(sp->wrk->wfd);
 	AZ(sp->vbe);
@@ -614,7 +615,7 @@
 		sp->step = STP_RECV;
 		return (0);
 	case VCL_RET_PASS:
-		if (sp->obj->objcore != NULL) 
+		if (sp->obj->objcore != NULL)
 			sp->obj->objcore->flags |= OC_F_PASS;
 		if (sp->obj->ttl - sp->t_req < params->default_ttl)
 			sp->obj->ttl = sp->t_req + params->default_ttl;
@@ -1026,8 +1027,8 @@
 	sp->director = sp->vcl->director[0];
 	AN(sp->director);
 
-      	sp->disable_esi = 0;
-	
+	sp->disable_esi = 0;
+
 	VCL_recv_method(sp);
 	if (sp->restarts >= params->max_restarts) {
 		if (sp->err_code == 0)

Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -224,7 +224,7 @@
 
 static void
 ccf_panic(struct cli *cli, const char * const *av, void *priv)
-{ 
+{
 
 	(void)cli;
 	(void)av;

Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -111,7 +111,7 @@
 	if (ep->p == finis)
 		return;
 	ep->p++;
-	if (ep->p < (char*)ep->st->ptr + ep->st->len) 
+	if (ep->p < (char*)ep->st->ptr + ep->st->len)
 		return;
 	ep->st = VTAILQ_NEXT(ep->st, list);
 	if (ep->st != NULL) {
@@ -605,7 +605,7 @@
 	ll = Tlen(ew->tag);
 	ew->tag.b++;
 	ew->tag.e--;
-	empty = (ew->tag.e[-1] == '/') ? 1 : 0; 
+	empty = (ew->tag.e[-1] == '/') ? 1 : 0;
 	if (empty)
 		ew->tag.e--;
 
@@ -648,7 +648,7 @@
 		} else if (!empty) {
 			esi_error(ew, ew->s.p, ll,
 			    "ESI 1.0 wants empty esi:include");
-		} 
+		}
 		ew->tag.b += 7;
 		esi_handle_include(ew);
 	} else {
@@ -712,7 +712,7 @@
 	AN(ew->p.st);
 	ew->p.p = (char *)ew->p.st->ptr;
 	ew->p.e = ew->p.p + ew->p.st->len;
-	
+
 	/* ->s points to the first un-dealt-with byte */
 	ew->s = ew->p;
 

Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -287,7 +287,7 @@
 		if (oc->flags & OC_F_ONLRU) {
 			VLIST_REMOVE(oc, lru_list);
 			oc->flags &= ~OC_F_ONLRU;
-		} 
+		}
 
 		VSL_stats->n_expired++;
 

Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -247,7 +247,8 @@
 		if (v == 0) {
 			if (st != NULL && fetchfrag > 0)
 				dump_st(sp, st);
-			st = STV_alloc(sp, params->fetch_chunksize * 1024LL, NULL);
+			st = STV_alloc(sp, params->fetch_chunksize * 1024LL,
+			    NULL);
 			VTAILQ_INSERT_TAIL(&sp->obj->store, st, list);
 			p = st->ptr + st->len;
 			v = st->space - st->len;
@@ -486,7 +487,7 @@
 		sp->wrk->stats.fetch_zero++;
 		/*
 		 * Assume zero length
-		 * XXX:  ??? 
+		 * XXX:  ???
 		 */
 		mklen = 1;
 	}
@@ -518,7 +519,7 @@
 		http_PrintfHeader(sp->wrk, sp->fd, sp->obj->http,
 		    "Content-Length: %u", sp->obj->len);
 
-	if (http_HdrIs(hp, H_Connection, "close")) 
+	if (http_HdrIs(hp, H_Connection, "close"))
 		cls = 1;
 
 	if (cls)

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -320,7 +320,7 @@
 	for (i = 0; i < nused; i++)
 		if (!memcmp(hsh_magiclist[i].was, result, SHA256_LEN))
 			break;
-	if (i == nused && i < HSH_NMAGIC) 
+	if (i == nused && i < HSH_NMAGIC)
 		memcpy(hsh_magiclist[nused++].was, result, SHA256_LEN);
 	if (i == nused)
 		return;
@@ -355,7 +355,7 @@
 	HSH_Prealloc(sp);
 	if (params->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
-	
+
 	AZ(sp->objhead);
 	AN(w->nobjhead);
 	oh = hash->lookup(sp, w->nobjhead);
@@ -399,7 +399,7 @@
 	HSH_Prealloc(sp);
 	if (params->diag_bitmap & 0x80000000)
 		hsh_testmagic(sp->wrk->nobjhead->digest);
-	
+
 	if (sp->objhead != NULL) {
 		CHECK_OBJ_NOTNULL(sp->objhead, OBJHEAD_MAGIC);
 		oh = sp->objhead;
@@ -432,12 +432,12 @@
 
 		o = oc->obj;
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
-		
+
 		if (!o->cacheable)
 			continue;
 		if (o->ttl == 0)
 			continue;
-		if (BAN_CheckObject(o, sp)) 
+		if (BAN_CheckObject(o, sp))
 			continue;
 		if (o->vary != NULL && !VRY_Match(sp, o->vary))
 			continue;
@@ -465,7 +465,7 @@
 	 * set here? FIXME:Grace.
 	 */
 	sp->objhead = oh;
-	if (oc == NULL && grace_oc != NULL && 
+	if (oc == NULL && grace_oc != NULL &&
 	    (busy_oc != NULL || !sp->director->healthy(sp))) {
 		o = grace_oc->obj;
 		CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
@@ -629,7 +629,7 @@
 /*******************************************************************
  * This one is slightly tricky.  This is called from the BAN module
  * to try to wash the object which holds the oldest ban.
- * We compete against HSH_Deref() which comes in the opposite 
+ * We compete against HSH_Deref() which comes in the opposite
  * locking order, we need to hold the BAN mutex, to stop the
  * BAN_DestroyObj() call in HSH_Deref(), so that the objhead
  * will not be removed under us.
@@ -680,12 +680,12 @@
 		CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 		oh = oc->objhead;
 		CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
-		
+
 		Lck_Lock(&oh->mtx);
 		assert(oh->refcnt > 0);
 		assert(o->refcnt > 0);
 		r = --o->refcnt;
-		if (!r) 
+		if (!r)
 			VTAILQ_REMOVE(&oh->objcs, oc, list);
 		hsh_rush(oh);
 		Lck_Unlock(&oh->mtx);

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -153,7 +153,7 @@
 
 	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 
+		   because a header could have been lost in
 		   http_copyHome */
 		if (hp->hd[u].b == NULL)
 			continue;
@@ -629,7 +629,7 @@
  * to 'how'.
  */
 
-unsigned 
+unsigned
 http_EstimateWS(const struct http *fm, unsigned how)
 {
 	unsigned u, l;

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -476,9 +476,9 @@
 wrk_herder_thread(void *priv)
 {
 	unsigned u, w;
-	pthread_attr_t tp_attr; 
+	pthread_attr_t tp_attr;
 
-	/* Set the stacksize for worker threads */ 
+	/* Set the stacksize for worker threads */
 	AZ(pthread_attr_init(&tp_attr));
 
 	THR_SetName("wrk_herder");
@@ -487,7 +487,7 @@
 		for (u = 0 ; u < nwq; u++) {
 			if (params->wthread_stacksize != UINT_MAX)
 				AZ(pthread_attr_setstacksize(&tp_attr,
-				    params->wthread_stacksize)); 
+				    params->wthread_stacksize));
 
 			wrk_breed_flock(wq[u], &tp_attr);
 

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -57,23 +57,30 @@
 	TIM_format(sp->t_req, lm);
 	http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Date: %s", lm);
 	http_SetHeader(sp->wrk, sp->fd, sp->wrk->resp, "Via: 1.1 varnish");
-	http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "X-Varnish: %u", sp->xid);
+	http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+	    "X-Varnish: %u", sp->xid);
 	if (sp->obj->last_modified) {
 		TIM_format(sp->obj->last_modified, lm);
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Last-Modified: %s", lm);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "Last-Modified: %s", lm);
 	}
 
 	/* http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.5 */
 	if (http_GetHdr(sp->obj->http, H_Cache_Control, &p))
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Cache-Control: %s", p);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "Cache-Control: %s", p);
 	if (http_GetHdr(sp->obj->http, H_Content_Location, &p))
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Content-Location: %s", p);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "Content-Location: %s", p);
 	if (http_GetHdr(sp->obj->http, H_ETag, &p))
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "ETag: %s", p);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "ETag: %s", p);
 	if (http_GetHdr(sp->obj->http, H_Expires, &p))
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Expires: %s", p);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "Expires: %s", p);
 	if (http_GetHdr(sp->obj->http, H_Vary, &p))
-		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Vary: %s", p);
+		http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+		    "Vary: %s", p);
 
 	http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Connection: %s",
 	    sp->doclose ? "close" : "keep-alive");
@@ -111,7 +118,7 @@
 		do_cond = 1;
 	}
 
-	if (do_cond == 1) { 
+	if (do_cond == 1) {
 		res_do_304(sp);
 		return (1);
 	}
@@ -142,7 +149,8 @@
 	if (!sp->disable_esi && sp->obj->esidata != NULL) {
 		http_Unset(sp->wrk->resp, H_Content_Length);
 		if(sp->http->protover >= 1.1)
-			http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Transfer-Encoding: chunked");
+			http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+			    "Transfer-Encoding: chunked");
 	}
 
 	TIM_format(TIM_real(), time_str);

Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -76,7 +76,7 @@
 
 /*--------------------------------------------------------------------*/
 
-static struct lock 		stat_mtx;
+static struct lock		stat_mtx;
 
 /*--------------------------------------------------------------------*/
 
@@ -86,7 +86,7 @@
 	struct acct *a = &sp->acct_req;
 
 #define ACCT(foo)	\
-	sp->wrk->stats.s_##foo += a->foo; 	\
+	sp->wrk->stats.s_##foo += a->foo;	\
 	sp->acct.foo += a->foo;		\
 	a->foo = 0;
 #include "acct_fields.h"
@@ -135,7 +135,7 @@
 	sp->t_end = NAN;
 	sp->grace = NAN;
 	sp->disable_esi = 0;
-	
+
 	assert(len <= sp->sockaddrlen);
 	if (addr != NULL) {
 		memcpy(sp->sockaddr, addr, len);
@@ -252,15 +252,15 @@
 	AN(sp->vbe->backend);
 
 	be = sp->vbe->backend;
-	/* 
+	/*
 	 * We only inherit the backend's timeout if the session timeout
 	 * has not already been set in the VCL, as the order of precedence
 	 * is parameter < backend definition < VCL.
 	 */
-	if (be->connect_timeout > 1e-3 && 
+	if (be->connect_timeout > 1e-3 &&
 	    sp->connect_timeout == params->connect_timeout)
 		sp->connect_timeout = be->connect_timeout;
-	if (be->first_byte_timeout > 1e-3 && 
+	if (be->first_byte_timeout > 1e-3 &&
 	    sp->first_byte_timeout == params->first_byte_timeout)
 		sp->first_byte_timeout = be->first_byte_timeout;
 	if (be->between_bytes_timeout > 1e-3 &&

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, reason ? 
+	WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, reason ?
 	    reason : "(null)");
 	sp->err_code = code ? code : 503;
 	sp->err_reason = reason ? reason : http_StatusMessage(sp->err_code);
@@ -281,7 +281,7 @@
 
 /* Add an objecthead to the saintmode list for the (hopefully) relevant
  * backend. Some double-up asserting here to avoid assert-errors when there
- * is no object. 
+ * is no object.
  */
 void
 VRT_l_beresp_saintmode(const struct sess *sp, double a)
@@ -305,7 +305,7 @@
 	 * when compiling the VCL would be better.
 	 */
 	assert(a > 0);
-	
+
 	ALLOC_OBJ(new, TROUBLE_MAGIC);
 	AN(new);
 	new->objhead = sp->objhead;
@@ -314,7 +314,7 @@
 	/* Insert the new item on the list before the first item with a
 	 * timeout at a later date (ie: sort by which entry will time out
 	 * from the list
-	 */	
+	 */
 	Lck_Lock(&sp->vbe->backend->mtx);
 	VTAILQ_FOREACH_SAFE(tr, &sp->vbe->backend->troublelist, list, tr2) {
 		if (tr->timeout < new->timeout) {
@@ -329,7 +329,7 @@
 	 */
 	if (new)
 		VTAILQ_INSERT_TAIL(&sp->vbe->backend->troublelist, new, list);
-	
+
 	Lck_Unlock(&sp->vbe->backend->mtx);
 }
 
@@ -708,7 +708,7 @@
 
 	if (heritage.identity[0] != '\0')
 		return heritage.identity;
-	else 
+	else
 		return heritage.name;
 }
 
@@ -720,7 +720,7 @@
 
 	if (vrt_hostname[0] == '\0')
 		AZ(gethostname(vrt_hostname, 255));
-	
+
 	return (vrt_hostname);
 }
 
@@ -965,7 +965,7 @@
 		a1 = va_arg(ap, char *);
 		good = 1;
 	}
-	if (!good) 
+	if (!good)
 		/* XXX: report error how ? */
 		BAN_Free(b);
 	else
@@ -1018,7 +1018,7 @@
 		if (strcmp(av[i++], "&&"))
 			break;
 	}
-	if (!good) 
+	if (!good)
 		/* XXX: report error how ? */
 		BAN_Free(b);
 	else

Modified: trunk/varnish-cache/bin/varnishd/common.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/common.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/common.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -65,4 +65,4 @@
 	void            *ptr;
 };
 
-#define NEEDLESS_RETURN(foo) 	return (foo)
+#define NEEDLESS_RETURN(foo)	return (foo)

Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -173,7 +173,7 @@
 	if (--oh->refcnt == 0) {
 		VTAILQ_REMOVE(&hp->head, oh, hoh_list);
 		ret = 0;
-	} else 
+	} else
 		ret = 1;
 	Lck_Unlock(&hp->mtx);
 	return (ret);

Modified: trunk/varnish-cache/bin/varnishd/hash_critbit.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -51,10 +51,10 @@
 /**********************************************************************
  * Table for finding out how many bits two bytes have in common,
  * counting from the MSB towards the LSB.
- * ie: 
+ * ie:
  *	hcb_bittbl[0x01 ^ 0x22] == 2
  *	hcb_bittbl[0x10 ^ 0x0b] == 3
- * 
+ *
  */
 
 static unsigned char hcb_bittbl[256];
@@ -163,7 +163,8 @@
 /**********************************************************************/
 
 static unsigned
-hcb_crit_bit(const struct objhead *oh1, const struct objhead *oh2, struct hcb_y *y)
+hcb_crit_bit(const struct objhead *oh1, const struct objhead *oh2,
+    struct hcb_y *y)
 {
 	unsigned char u, r;
 
@@ -264,7 +265,7 @@
 	}
 	p = &r->origo;
 	assert(hcb_is_y(*p));
-	
+
 	y = NULL;
 	while(1) {
 		assert(hcb_is_y(*p));
@@ -422,7 +423,7 @@
 {
 	struct objhead *oh;
 	unsigned u;
-	
+
 	oh =  hcb_insert(&hcb_root, noh, 0);
 	if (oh != NULL) {
 		/* Assert that we didn't muck with the tree without lock */

Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -159,7 +159,7 @@
 
 	/* Read timeouts for backend */
 	double			first_byte_timeout;
-	double	 		between_bytes_timeout;
+	double			between_bytes_timeout;
 
 	/* How long to linger on sessions */
 	unsigned		session_linger;

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -546,7 +546,7 @@
 		start_child(NULL);
 		if (child_state == CH_STOPPED)
 			exit(2);
-	} 
+	}
 
 	i = vev_schedule(mgt_evb);
 	if (i != 0)

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -326,7 +326,7 @@
 	}
 	cp->challenge[0] = '\0';
 	cli_result(cli, CLIS_OK);
-	if (params->cli_banner) 
+	if (params->cli_banner)
 		mcf_banner(cli, av, priv);
 }
 
@@ -379,11 +379,11 @@
 	if (secret_file != NULL && cp->challenge[0] != '\0') {
 		/* Authentication not yet passed */
 		cli_dispatch(cp->cli, cli_auth, p);
-		if (cp->cli->result == CLIS_UNKNOWN) 
+		if (cp->cli->result == CLIS_UNKNOWN)
 			mgt_cli_challenge(cp);
 	} else {
 		cli_dispatch(cp->cli, cli_proto, p);
-		if (cp->cli->result == CLIS_UNKNOWN) 
+		if (cp->cli->result == CLIS_UNKNOWN)
 			cli_dispatch(cp->cli, cli_debug, p);
 		if (cp->cli->result == CLIS_UNKNOWN) {
 			/*

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -68,7 +68,7 @@
 	int i;
 
 	for (i = 0; i < nparspec; i++)
-		if (!strcmp(parspec[i]->name, name)) 
+		if (!strcmp(parspec[i]->name, name))
 			return (parspec[i]);
 	return (NULL);
 }
@@ -93,7 +93,8 @@
 }
 
 static void
-tweak_generic_timeout_double(struct cli *cli, volatile double *dst, const char *arg)
+tweak_generic_timeout_double(struct cli *cli, volatile double *dst,
+    const char *arg)
 {
 	double u;
 
@@ -123,7 +124,8 @@
 }
 
 static void
-tweak_timeout_double(struct cli *cli, const struct parspec *par, const char *arg)
+tweak_timeout_double(struct cli *cli, const struct parspec *par,
+    const char *arg)
 {
 	volatile double *dest;
 
@@ -646,18 +648,20 @@
 		&master.first_byte_timeout,0, UINT_MAX,
 		"Default timeout for receiving first byte from backend. "
 		"We only wait for this many seconds for the first "
-		"byte before giving up. A value of 0 means it will never time out. "
+		"byte before giving up. A value of 0 means it will never time "
+		"out. "
 		"VCL can override this default value for each backend and "
 		"backend request. This parameter does not apply to pipe.",
 		0,
 		"60", "s" },
 	{ "between_bytes_timeout", tweak_timeout_double,
 		&master.between_bytes_timeout,0, UINT_MAX,
-		"Default timeout between bytes when receiving data from backend. "
+		"Default timeout between bytes when receiving data from "
+		"backend. "
 		"We only wait for this many seconds between bytes "
 		"before giving up. A value of 0 means it will never time out. "
-		"VCL can override this default value for each backend request and "
-		"backend request. This parameter does not apply to pipe.",
+		"VCL can override this default value for each backend request "
+		"and backend request. This parameter does not apply to pipe.",
 		0,
 		"60", "s" },
 	{ "accept_fd_holdoff", tweak_timeout,
@@ -765,12 +769,13 @@
 		"A value of zero disables the ban lurker.",
 		0,
 		"0.0", "s" },
-	{ "saintmode_threshold", tweak_uint, &master.saintmode_threshold, 0, UINT_MAX,
-		"The maximum number of objects held off by saint mode before no further "
-		"will be made to the backend until one times out. A value of 0 disables "
-		"saintmode.",
+	{ "saintmode_threshold", tweak_uint,
+		&master.saintmode_threshold, 0, UINT_MAX,
+		"The maximum number of objects held off by saint mode before "
+		"no further will be made to the backend until one times out.  "
+		"A value of 0 disables saintmode.",
 		EXPERIMENTAL,
-		"10", "objects" }, 
+		"10", "objects" },
 	{ NULL, NULL, NULL }
 };
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -373,7 +373,7 @@
 		fprintf(stderr, "%s", vsb_data(sb));
 	vsb_delete(sb);
 	if (C_flag) {
-		if (vf != NULL) 
+		if (vf != NULL)
 			AZ(unlink(vf));
 		return (0);
 	}

Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -285,7 +285,7 @@
 void
 VSL_Panic(int *len, char **ptr)
 {
-	static char a[1] = { '\0' }; 
+	static char a[1] = { '\0' };
 
 	AN(len);
 	AN(ptr);

Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -48,7 +48,7 @@
  * NB! Dirty trick alert:
  *
  * We use a captive objcore as tail senteniel for LRU lists, but to
- * make sure it does not get into play by accident, we do _not_ 
+ * make sure it does not get into play by accident, we do _not_
  * initialize its magic with OBJCORE_MAGIC.
  *
  */
@@ -125,7 +125,7 @@
 		XXXAN(o);
 		STV_InitObj(sp, o, l);
 		return (o);
-	} 
+	}
 	st = STV_alloc(sp, sizeof *o + l, sp->objcore);
 	XXXAN(st);
 	xxxassert(st->space >= (sizeof *o + l));

Modified: trunk/varnish-cache/bin/varnishd/stevedore.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/stevedore.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -37,8 +37,10 @@
 
 typedef void storage_init_f(struct stevedore *, int ac, char * const *av);
 typedef void storage_open_f(const struct stevedore *);
-typedef struct storage *storage_alloc_f(struct stevedore *, size_t size, struct objcore *);
-typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size, double ttl);
+typedef struct storage *storage_alloc_f(struct stevedore *, size_t size,
+    struct objcore *);
+typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size,
+    double ttl);
 typedef void storage_trim_f(struct storage *, size_t size);
 typedef void storage_free_f(struct storage *);
 typedef void storage_object_f(const struct sess *sp);
@@ -78,7 +80,8 @@
 struct lru *LRU_Alloc(void);
 
 int STV_GetFile(const char *fn, int *fdp, const char **fnp, const char *ctx);
-uintmax_t STV_FileSize(int fd, const char *size, unsigned *granularity, const char *ctx);
+uintmax_t STV_FileSize(int fd, const char *size, unsigned *granularity,
+    const char *ctx);
 
 /* Synthetic Storage */
 void SMS_Init(void);

Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -65,7 +65,7 @@
 #define ASSERT_SILO_THREAD(sc) \
     do {assert(pthread_self() == (sc)->thread);} while (0)
 
-#define RDN2(x, y)  ((x)&(~((y)-1))) 		/* if y is powers of two */
+#define RDN2(x, y)  ((x)&(~((y)-1)))		/* if y is powers of two */
 #define RUP2(x, y)  (((x)+((y)-1))&(~((y)-1)))	/* if y is powers of two */
 
 /*
@@ -118,7 +118,7 @@
 
 struct smp_sc {
 	unsigned		magic;
-#define SMP_SC_MAGIC		0x7b73af0a 
+#define SMP_SC_MAGIC		0x7b73af0a
 	struct stevedore	*parent;
 
 	unsigned		flags;
@@ -177,7 +177,7 @@
 #define SEG_SPACE RUP2(SMP_SIGN_SPACE, CACHE_LINE_ALIGN)
 
 /*
- * silos is unlocked, it only changes during startup when we are 
+ * silos is unlocked, it only changes during startup when we are
  * single-threaded
  */
 static VTAILQ_HEAD(,smp_sc)	silos = VTAILQ_HEAD_INITIALIZER(silos);
@@ -199,7 +199,8 @@
  */
 
 static void
-smp_def_sign(const struct smp_sc *sc, struct smp_signctx *ctx, uint64_t off, const char *id)
+smp_def_sign(const struct smp_sc *sc, struct smp_signctx *ctx,
+    uint64_t off, const char *id)
 {
 
 	AZ(off & 7);			/* Alignment */
@@ -237,7 +238,7 @@
 		SHA256_Final(sign, &cx);
 		if (memcmp(sign, SIGN_END(ctx), sizeof sign))
 			r = 4;
-	} 
+	}
 	if (r) {
 		fprintf(stderr, "CHK(%p %s %p %s) = %d\n",
 		    ctx, ctx->id, ctx->ss,
@@ -305,7 +306,8 @@
  */
 
 static void
-smp_new_sign(const struct smp_sc *sc, struct smp_signctx *ctx, uint64_t off, const char *id)
+smp_new_sign(const struct smp_sc *sc, struct smp_signctx *ctx,
+    uint64_t off, const char *id)
 {
 	smp_def_sign(sc, ctx, off, id);
 	smp_reset_sign(ctx);
@@ -526,7 +528,7 @@
 {
 	struct smp_sc		*sc;
 	int i;
-	
+
 	ASSERT_MGT();
 
 	AZ(av[ac]);
@@ -685,10 +687,11 @@
  */
 
 static void
-smp_appendban(struct smp_sc *sc, struct smp_signctx *ctx, double t0, uint32_t flags, uint32_t len, const char *ban)
+smp_appendban(struct smp_sc *sc, struct smp_signctx *ctx, double t0,
+    uint32_t flags, uint32_t len, const char *ban)
 {
 	uint8_t *ptr, *ptr2;
-	
+
 	(void)sc;
 	ptr = ptr2 = SIGN_END(ctx);
 
@@ -736,7 +739,7 @@
 
 	ASSERT_CLI();
 	(void)sc;
-	i = smp_chk_sign(ctx);	
+	i = smp_chk_sign(ctx);
 	if (i)
 		return (i);
 	ptr = SIGN_DATA(ctx);
@@ -935,7 +938,7 @@
 	int i, n = 0;
 
 	ASSERT_CLI();
-	i = smp_chk_sign(ctx);	
+	i = smp_chk_sign(ctx);
 	if (i)
 		return (i);
 
@@ -960,7 +963,7 @@
 	l = sc->mediasize - sc->free_offset;
 	if (se->offset > ss->offset && l >= sc->free_reserve) {
 		/*
-		 * [__xxxxyyyyzzzz___] 
+		 * [__xxxxyyyyzzzz___]
 		 * Plenty of space at tail, do nothing.
 		 */
 //printf("TRS: %jx @ %jx\n", l, sc->free_offset);
@@ -985,7 +988,7 @@
 
 	if (l < sc->free_reserve) {
 		/*
-		 * [__xxxxyyyyzzzz___] 
+		 * [__xxxxyyyyzzzz___]
 		 * (make) space at front
 		 */
 		sc->free_offset = sc->ident->stuff[SMP_SPC_STUFF];
@@ -1208,7 +1211,7 @@
 	BAN_Deref(&sc->tailban);
 	sc->tailban = NULL;
 	printf("Silo completely loaded\n");
-	while (1)	 
+	while (1)
 		(void)sleep (1);
 	NEEDLESS_RETURN(NULL);
 }
@@ -1356,7 +1359,9 @@
 		left = smp_spaceleft(sg);
 
 		if (oc == NULL && needed > left && (overhead + 4096) < left) {
-			/* XXX: Also check the bit we cut off isn't silly short */
+			/* XXX: Also check the bit we cut off isn't silly
+			 * short
+			 */
 			/*
 			 * Non-objects can be trimmed down to fit what we
 			 * have to offer (think: DVD image), but we do not
@@ -1440,7 +1445,7 @@
 	size += 1;
 
 	sg = sc->cur_seg;
-	if (ss->ptr + ss->space != sg->next_addr + sc->ptr) 
+	if (ss->ptr + ss->space != sg->next_addr + sc->ptr)
 		return;
 
 	Lck_Lock(&sc->mtx);

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -442,7 +442,7 @@
 		return;
 	fi = popen(p, "r");
 	free(p);
-	if (fi == NULL) 
+	if (fi == NULL)
 		return;
 	while (fgets(buf, sizeof buf, fi)) {
 		if (buf[0] == ' ')
@@ -663,7 +663,6 @@
 		exit(1);
 	}
 
-
 	if (i_arg != NULL) {
 		if (snprintf(heritage.identity, sizeof heritage.identity,
 		    "%s", i_arg) > sizeof heritage.identity) {
@@ -672,7 +671,6 @@
 			exit(1);
 		}
 	}
-	
 
 	if (n_arg != NULL)
 		openlog(n_arg, LOG_PID, LOG_LOCAL0);

Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -397,8 +397,8 @@
 		usage();
 		exit(1);
 	}
-	
-	if (xml) 
+
+	if (xml)
 		do_xml(VSL_stats, fields);
 	else if (once)
 		do_once(VSL_stats, fields);

Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -309,7 +309,7 @@
 		break;
 	}
 	l = 0;
-	for (i = 0; i < 1000; i++) 
+	for (i = 0; i < 1000; i++)
 		l += random();
 	if (l != RND_NEXT_1K) {
 		vtc_log(vl, 4, "sum(random[%d...%d]) = 0x%x (expect 0x%x)",

Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
 
 	struct varnish_stats	*stats;
 
-	struct vsb 		*args;
+	struct vsb		*args;
 	int			fds[4];
 	pid_t			pid;
 	const char		*telnet;

Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -274,7 +274,9 @@
 		if (tp->count <= 1.0)
 			break;
 		len = SHMLOG_LEN(tp->rec);
-		printf("%9.2f %s %*.*s\n", tp->count, VSL_tags[tp->rec[SHMLOG_TAG]], len, len, tp->rec + SHMLOG_DATA);
+		printf("%9.2f %s %*.*s\n",
+		    tp->count, VSL_tags[tp->rec[SHMLOG_TAG]],
+		    len, len, tp->rec + SHMLOG_DATA);
 	}
 }
 

Modified: trunk/varnish-cache/include/cli.h
===================================================================
--- trunk/varnish-cache/include/cli.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/cli.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -79,7 +79,7 @@
 	"purge <field> <operator> <arg> [&& <field> <oper> <arg>]...",	\
 	"\tAll objects where the all the conditions match will be "	\
 	    "marked obsolete.",						\
-	3, UINT_MAX 
+	3, UINT_MAX
 
 #define CLI_PURGE_LIST							\
 	"purge.list",							\
@@ -225,13 +225,13 @@
 	"\tCheck status of Varnish cache process.",			\
 	0, 0
 
-#define CLI_BANNER	 						\
+#define CLI_BANNER							\
 	"banner",							\
 	"banner",							\
 	"\tPrint welcome banner.",					\
 	0, 0
 
-#define CLI_AUTH	 						\
+#define CLI_AUTH							\
 	"auth",								\
 	"auth response",						\
 	"\tAuthenticate.",						\

Modified: trunk/varnish-cache/include/compat/daemon.h
===================================================================
--- trunk/varnish-cache/include/compat/daemon.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/compat/daemon.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -34,7 +34,7 @@
 
 #ifndef HAVE_DAEMON
 int varnish_daemon(int nochdir, int noclose);
-#else 
+#else
 #define varnish_daemon(a,b)  daemon(a,b)
 #endif
 

Modified: trunk/varnish-cache/include/http_headers.h
===================================================================
--- trunk/varnish-cache/include/http_headers.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/http_headers.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -57,36 +57,36 @@
 HTTPH("Accept-Encoding",	H_Accept_Encoding,	1, 0, 0,										0, 0)	/* RFC2616 14.3 */
 HTTPH("Accept-Language",	H_Accept_Language,	1, 0, 0,										0, 0)	/* RFC2616 14.4 */
 HTTPH("Accept-Ranges",		H_Accept_Ranges,	2, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.5 */
-HTTPH("Age",			H_Age,			2, 0, 						    HTTPH_A_INS,			0, 0)	/* RFC2616 14.6 */
+HTTPH("Age",			H_Age,			2, 0,						    HTTPH_A_INS,			0, 0)	/* RFC2616 14.6 */
 HTTPH("Allow",			H_Allow,		2, 0, 0,										0, 0)	/* RFC2616 14.7 */
 HTTPH("Authorization",		H_Authorization,	1, 0, 0,										0, 0)	/* RFC2616 14.8 */
-HTTPH("Cache-Control",		H_Cache_Control,	3, 3, HTTPH_R_PASS | 		    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.9 */
+HTTPH("Cache-Control",		H_Cache_Control,	3, 3, HTTPH_R_PASS |		    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.9 */
 HTTPH("Connection",		H_Connection,		3, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.10 */
 HTTPH("Content-Encoding",	H_Content_Encoding,	2, 0, 0,										0, 0)	/* RFC2616 14.11 */
 HTTPH("Content-Langugae",	H_Content_Language,	2, 0, 0,										0, 0)	/* RFC2616 14.12 */
-HTTPH("Content-Length",		H_Content_Length,	2, 2, 				    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.13 */
+HTTPH("Content-Length",		H_Content_Length,	2, 2,				    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.13 */
 HTTPH("Content-Location",	H_Content_Location,	2, 0, 0,										0, 0)	/* RFC2616 14.14 */
 HTTPH("Content-MD5",		H_Content_MD5,		2, 0, 0,										0, 0)	/* RFC2616 14.15 */
 HTTPH("Content-Range",		H_Content_Range,	2, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.16 */
 HTTPH("Content-Type",		H_Content_Type,		2, 0, 0,										0, 0)	/* RFC2616 14.17 */
-HTTPH("Date",			H_Date,			2, 0, 								HTTPH_A_DELIVER,	0, 0)	/* RFC2616 14.18 */
+HTTPH("Date",			H_Date,			2, 0,								HTTPH_A_DELIVER,	0, 0)	/* RFC2616 14.18 */
 HTTPH("ETag",			H_ETag,			2, 0, 0,										0, 0)	/* RFC2616 14.19 */
 HTTPH("Expect",			H_Expect,		1, 0, 0,										0, 0)	/* RFC2616 14.20 */
 HTTPH("Expires",		H_Expires,		2, 0, 0,										0, 0)	/* RFC2616 14.21 */
 HTTPH("From",			H_From,			1, 0, 0,										0, 0)	/* RFC2616 14.22 */
 HTTPH("Host",			H_Host,			1, 0, 0,										0, 0)	/* RFC2616 14.23 */
-HTTPH("If-Match",		H_If_Match,		1, 1, 				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.24 */
-HTTPH("If-Modified-Since",	H_If_Modified_Since,	1, 1, 				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.25 */
-HTTPH("If-None-Match",		H_If_None_Match,	1, 1, 				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.26 */
-HTTPH("If-Range",		H_If_Range,		1, 1, 				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.27 */
-HTTPH("If-Unmodified-Since",	H_If_Unmodifed_Since,	1, 1, 				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.28 */
+HTTPH("If-Match",		H_If_Match,		1, 1,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.24 */
+HTTPH("If-Modified-Since",	H_If_Modified_Since,	1, 1,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.25 */
+HTTPH("If-None-Match",		H_If_None_Match,	1, 1,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.26 */
+HTTPH("If-Range",		H_If_Range,		1, 1,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.27 */
+HTTPH("If-Unmodified-Since",	H_If_Unmodifed_Since,	1, 1,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.28 */
 HTTPH("Last-Modified",		H_Last_Modified,	2, 0, 0,										0, 0)	/* RFC2616 14.29 */
 HTTPH("Location",		H_Location,		2, 0, 0,										0, 0)	/* RFC2616 14.30 */
 HTTPH("Max-Forwards",		H_Max_Forwards,		1, 0, 0,										0, 0)	/* RFC2616 14.31 */
 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,                  		    HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.35 */
+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,				    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 */

Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/libvarnish.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -52,7 +52,8 @@
 
 /* from libvarnish/subproc.c */
 typedef void sub_func_f(void*);
-int SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name, int maxlines);
+int SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name,
+    int maxlines);
 
 /* from libvarnish/tcp.c */
 /* NI_MAXHOST and NI_MAXSERV are ridiculously long for numeric format */

Modified: trunk/varnish-cache/include/persistent.h
===================================================================
--- trunk/varnish-cache/include/persistent.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/persistent.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -32,7 +32,7 @@
  *
  * Overall layout:
  *
- *	struct smp_ident;		Identification and geometry 
+ *	struct smp_ident;		Identification and geometry
  *	sha256[...]			checksum of same
  *
  *	struct smp_sign;
@@ -134,8 +134,8 @@
 
 struct smp_object {
 	unsigned char		hash[32];
-	double  		ttl;
-	double  		ban;
+	double			ttl;
+	double			ban;
 	struct object		*ptr;
 	uint64_t		len;	/* XXX: madvise */
 };

Modified: trunk/varnish-cache/include/purge_vars.h
===================================================================
--- trunk/varnish-cache/include/purge_vars.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/purge_vars.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -35,6 +35,6 @@
 #define PVAR_REQ	2
 
 PVAR("req.url",		PVAR_REQ,		ban_cond_url)
-PVAR("obj.hash", 	0,			ban_cond_hash)
+PVAR("obj.hash",	0,			ban_cond_hash)
 PVAR("req.http.",	PVAR_REQ|PVAR_HTTP,	ban_cond_req_http)
 PVAR("obj.http.",	PVAR_HTTP,		ban_cond_obj_http)

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/stat_field.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -72,7 +72,8 @@
 MAC_STAT(n_vbe_conn,		uint64_t, 0, 'i', "N struct vbe_conn")
 MAC_STAT(n_wrk,			uint64_t, 0, 'i', "N worker threads")
 MAC_STAT(n_wrk_create,		uint64_t, 0, 'a', "N worker threads created")
-MAC_STAT(n_wrk_failed,		uint64_t, 0, 'a', "N worker threads not created")
+MAC_STAT(n_wrk_failed,		uint64_t, 0, 'a',
+					"N worker threads not created")
 MAC_STAT(n_wrk_max,		uint64_t, 0, 'a', "N worker threads limited")
 MAC_STAT(n_wrk_queue,		uint64_t, 0, 'a', "N queued work requests")
 MAC_STAT(n_wrk_overflow,	uint64_t, 0, 'a', "N overflowed work requests")
@@ -89,7 +90,8 @@
 
 MAC_STAT(n_objsendfile,		uint64_t, 0, 'a', "Objects sent with sendfile")
 MAC_STAT(n_objwrite,		uint64_t, 0, 'a', "Objects sent with write")
-MAC_STAT(n_objoverflow,		uint64_t, 1, 'a', "Objects overflowing workspace")
+MAC_STAT(n_objoverflow,		uint64_t, 1, 'a',
+					"Objects overflowing workspace")
 
 MAC_STAT(s_sess,		uint64_t, 1, 'a', "Total Sessions")
 MAC_STAT(s_req,			uint64_t, 1, 'a', "Total Requests")

Modified: trunk/varnish-cache/include/vqueue.h
===================================================================
--- trunk/varnish-cache/include/vqueue.h	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/vqueue.h	2009-11-19 19:03:25 UTC (rev 4358)
@@ -242,7 +242,7 @@
 	(VSTAILQ_EMPTY((head)) ?					\
 		NULL :							\
 	        ((struct type *)(void *)				\
-		((char *)((head)->vstqh_last) - 			\
+		((char *)((head)->vstqh_last) -				\
 		     __offsetof(struct type, field))))
 
 #define	VSTAILQ_NEXT(elm, field)	((elm)->field.vstqe_next)

Modified: trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -1212,7 +1212,7 @@
 /******************************************************************************/
 
 /*
- * Functions missing prototypes which caused -Werror to fail. 
+ * Functions missing prototypes which caused -Werror to fail.
  * Not sure if it has any side effects.
  * */
 size_t malloc_usable_size(const void *ptr);

Modified: trunk/varnish-cache/lib/libvarnish/binary_heap.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/binary_heap.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/binary_heap.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -186,7 +186,7 @@
 		v2 = CHILD(u, 1);
 		if (v2 < bh->next && bh->cmp(bh->priv, A(bh, v2), A(bh, v1)))
 			v1 = v2;
-		if (bh->cmp(bh->priv, A(bh, u), A(bh, v1))) 
+		if (bh->cmp(bh->priv, A(bh, u), A(bh, v1)))
 			return;
 		binhead_swap(bh, u, v1);
 		u = v1;
@@ -426,7 +426,7 @@
 			binheap_delete(bh, ff[v].idx);
 		} else {
 			ff[v].key = random();
-			if (0) 
+			if (0)
 				printf("Insert [%u] %'u\n", v, ff[v].key);
 			else
 				printf("+%u", v);

Modified: trunk/varnish-cache/lib/libvarnish/subproc.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/subproc.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/subproc.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -66,7 +66,8 @@
 }
 
 int
-SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name, int maxlines)
+SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name,
+    int maxlines)
 {
 	int rv, p[2], sfd, status;
 	pid_t pid;

Modified: trunk/varnish-cache/lib/libvarnish/tcp.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/tcp.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/tcp.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -235,7 +235,7 @@
 /*--------------------------------------------------------------------
  * Set or reset SO_LINGER flag
  */
- 
+
 void
 TCP_linger(int sock, int linger)
 {

Modified: trunk/varnish-cache/lib/libvarnish/vlu.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vlu.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/vlu.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -47,7 +47,7 @@
 	unsigned	bufl;
 	unsigned	bufp;
 	void		*priv;
-	int 		telnet;
+	int		telnet;
 	vlu_f	*func;
 };
 
@@ -145,7 +145,7 @@
 	for (p = l->buf; *p != '\0'; p = q) {
 		/* Find first CR or NL */
 		for (q = p; *q != '\0'; q++) {
-			while (l->telnet >= 0 && *q == (char)255) 
+			while (l->telnet >= 0 && *q == (char)255)
 				if (vlu_dotelnet(l, q))
 					return (0);
 			if (*q == '\n' || *q == '\r')

Modified: trunk/varnish-cache/lib/libvarnish/vsha256.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vsha256.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/vsha256.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -114,7 +114,7 @@
 		dst[i] = mybe32dec(src + i * 4);
 }
 
-#endif 
+#endif
 
 /* Elementary functions used by SHA256 */
 #define Ch(x, y, z)	((x & (y ^ z)) ^ z)

Modified: trunk/varnish-cache/lib/libvarnishcompat/execinfo.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnishcompat/execinfo.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -116,7 +116,7 @@
             rval[i] = (char *) clen;
             clen += alen;
 	    continue;
-        } 
+        }
     }
 #endif
 	alen = 2 +                      /* "0x" */

Modified: trunk/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_acl.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_acl.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
 		else if ((b) < (a))					\
 			return (1);					\
 	} while (0)
-		
+
 static int
 vcl_acl_cmp(struct acl_e *ae1, struct acl_e *ae2)
 {

Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -352,7 +352,7 @@
 } purge_var[] = {
 #define PVAR(a, b, c)   { (a), (b) },
 #include "purge_vars.h"
-#undef PVAR     
+#undef PVAR
         { 0, 0 }
 };
 

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -466,7 +466,7 @@
 		Fb(tl, 0, "\t\t.window = %u,\n", window);
 		Fb(tl, 0, "\t\t.threshold = %u,\n", threshold);
 	}
-	if (t_initial != NULL) 
+	if (t_initial != NULL)
 		Fb(tl, 0, "\t\t.initial = %u,\n", initial);
 	else
 		Fb(tl, 0, "\t\t.initial = ~0U,\n", initial);
@@ -597,7 +597,8 @@
 			 * not allowed here.
 			 */
 			if (u == UINT_MAX) {
-				vsb_printf(tl->sb, "Value outside allowed range: ");
+				vsb_printf(tl->sb,
+				    "Value outside allowed range: ");
 				vcc_ErrToken(tl, tl->t);
 				vsb_printf(tl->sb, " at\n");
 				vcc_ErrWhere(tl, tl->t);

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -228,10 +228,10 @@
 	vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
 	vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
 	vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
-	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4336 2009-10-21 11:");
-	vsb_cat(sb, "36:28Z kristian $\n *\n * Runtime support for compiled");
-	vsb_cat(sb, " VCL programs.\n *\n * XXX: When this file is changed,");
-	vsb_cat(sb, " lib/libvcl/vcc_gen_fixed_token.tcl\n");
+	vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4356 2009-11-19 11:");
+	vsb_cat(sb, "40:23Z phk $\n *\n * Runtime support for compiled VCL ");
+	vsb_cat(sb, "programs.\n *\n * XXX: When this file is changed, lib/");
+	vsb_cat(sb, "libvcl/vcc_gen_fixed_token.tcl\n");
 	vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");
 	vsb_cat(sb, "\nstruct sess;\nstruct vsb;\nstruct cli;\n");
 	vsb_cat(sb, "struct director;\nstruct VCL_conf;\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2009-11-19 19:03:25 UTC (rev 4358)
@@ -258,12 +258,12 @@
     #######################################################################
     # The (possibly) cached object
     { obj.proto				STRING
-	RW 
+	RW
 	{ hit error }
 	"const struct sess *"
     }
     { obj.status			INT
-	RW 
+	RW
 	{ error }
 	"const struct sess *"
     }
@@ -491,12 +491,12 @@
 			puts $fo  "\t\{ \"$n\", $t, [string length $n],"
 		}
 		if {$a == "RO" || $a == "RW"} {
-			puts -nonewline $fo  "\t    \"VRT_r_${m}($pa)\","
+			puts $fo  "\t    \"VRT_r_${m}($pa)\","
 			if {![regexp HDR_ $t]} {
 				puts $fp  "$tt($t) VRT_r_${m}($ty);"
 			}
 		} else {
-			puts -nonewline $fo  "\t    NULL,"
+			puts $fo  "\t    NULL,"
 		}
 		if {$a == "WO" || $a == "RW"} {
 			puts $fo  "\t    \"VRT_l_${m}($pa, \","
@@ -554,7 +554,8 @@
 	} else {
 		set sp ""
 	}
-	puts $fo "#define VCL_MET_[string toupper [lindex $m 0]]\t${sp}(1U << $u)"
+	puts -nonewline $fo "#define VCL_MET_[string toupper [lindex $m 0]]\t"
+	puts $fo "${sp}(1U << $u)"
 	incr u
 }
 
@@ -721,7 +722,7 @@
 			puts -nonewline $fo "'[string index $k 1]'"
 			puts            $fo ", [lindex $ty 1]);"
 			continue;
-		} 
+		}
 		puts -nonewline $fo "		if ("
 		for {set i 1} {$i < [string length $k]} {incr i} {
 			if {$i > 1} {

Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -12,260 +12,306 @@
 
 struct var vcc_vars[] = {
 	{ "client.ip", IP, 9,
-	    "VRT_r_client_ip(sp)",	    NULL,
+	    "VRT_r_client_ip(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "server.ip", IP, 9,
-	    "VRT_r_server_ip(sp)",	    NULL,
+	    "VRT_r_server_ip(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "server.hostname", STRING, 15,
-	    "VRT_r_server_hostname(sp)",	    NULL,
+	    "VRT_r_server_hostname(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "server.identity", STRING, 15,
-	    "VRT_r_server_identity(sp)",	    NULL,
+	    "VRT_r_server_identity(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "server.port", INT, 11,
-	    "VRT_r_server_port(sp)",	    NULL,
+	    "VRT_r_server_port(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.request", STRING, 11,
-	    "VRT_r_req_request(sp)",	    "VRT_l_req_request(sp, ",
+	    "VRT_r_req_request(sp)",
+	    "VRT_l_req_request(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.url", STRING, 7,
-	    "VRT_r_req_url(sp)",	    "VRT_l_req_url(sp, ",
+	    "VRT_r_req_url(sp)",
+	    "VRT_l_req_url(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.proto", STRING, 9,
-	    "VRT_r_req_proto(sp)",	    "VRT_l_req_proto(sp, ",
+	    "VRT_r_req_proto(sp)",
+	    "VRT_l_req_proto(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.http.", HEADER, 9,
-	    "VRT_r_req_http_(sp)",	    "VRT_l_req_http_(sp, ",
+	    "VRT_r_req_http_(sp)",
+	    "VRT_l_req_http_(sp, ",
 	    V_RW,	    "HDR_REQ",
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.hash", HASH, 8,
-	    NULL,	    "VRT_l_req_hash(sp, ",
+	    NULL,
+	    "VRT_l_req_hash(sp, ",
 	    V_WO,	    0,
 	    VCL_MET_HASH | VCL_MET_ERROR
 	},
 	{ "req.backend", BACKEND, 11,
-	    "VRT_r_req_backend(sp)",	    "VRT_l_req_backend(sp, ",
+	    "VRT_r_req_backend(sp)",
+	    "VRT_l_req_backend(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.restarts", INT, 12,
-	    "VRT_r_req_restarts(sp)",	    NULL,
+	    "VRT_r_req_restarts(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.grace", TIME, 9,
-	    "VRT_r_req_grace(sp)",	    "VRT_l_req_grace(sp, ",
+	    "VRT_r_req_grace(sp)",
+	    "VRT_l_req_grace(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.xid", STRING, 7,
-	    "VRT_r_req_xid(sp)",	    NULL,
+	    "VRT_r_req_xid(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "req.esi", BOOL, 7,
-	    "VRT_r_req_esi(sp)",	    "VRT_l_req_esi(sp, ",
+	    "VRT_r_req_esi(sp)",
+	    "VRT_l_req_esi(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_RECV | VCL_MET_FETCH | VCL_MET_DELIVER | VCL_MET_ERROR
 	},
 	{ "req.backend.healthy", BOOL, 19,
-	    "VRT_r_req_backend_healthy(sp)",	    NULL,
+	    "VRT_r_req_backend_healthy(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
 	     | VCL_MET_ERROR
 	},
 	{ "bereq.request", STRING, 13,
-	    "VRT_r_bereq_request(sp)",	    "VRT_l_bereq_request(sp, ",
+	    "VRT_r_bereq_request(sp)",
+	    "VRT_l_bereq_request(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.url", STRING, 9,
-	    "VRT_r_bereq_url(sp)",	    "VRT_l_bereq_url(sp, ",
+	    "VRT_r_bereq_url(sp)",
+	    "VRT_l_bereq_url(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.proto", STRING, 11,
-	    "VRT_r_bereq_proto(sp)",	    "VRT_l_bereq_proto(sp, ",
+	    "VRT_r_bereq_proto(sp)",
+	    "VRT_l_bereq_proto(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.http.", HEADER, 11,
-	    "VRT_r_bereq_http_(sp)",	    "VRT_l_bereq_http_(sp, ",
+	    "VRT_r_bereq_http_(sp)",
+	    "VRT_l_bereq_http_(sp, ",
 	    V_RW,	    "HDR_BEREQ",
 	    VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
 	},
 	{ "bereq.connect_timeout", TIME, 21,
-	    "VRT_r_bereq_connect_timeout(sp)",	    "VRT_l_bereq_connect_timeout(sp, ",
+	    "VRT_r_bereq_connect_timeout(sp)",
+	    "VRT_l_bereq_connect_timeout(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PASS | VCL_MET_MISS
 	},
 	{ "bereq.first_byte_timeout", TIME, 24,
-	    "VRT_r_bereq_first_byte_timeout(sp)",	    "VRT_l_bereq_first_byte_timeout(sp, ",
+	    "VRT_r_bereq_first_byte_timeout(sp)",
+	    "VRT_l_bereq_first_byte_timeout(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PASS | VCL_MET_MISS
 	},
 	{ "bereq.between_bytes_timeout", TIME, 27,
-	    "VRT_r_bereq_between_bytes_timeout(sp)",	    "VRT_l_bereq_between_bytes_timeout(sp, ",
+	    "VRT_r_bereq_between_bytes_timeout(sp)",
+	    "VRT_l_bereq_between_bytes_timeout(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_PASS | VCL_MET_MISS
 	},
 	{ "beresp.proto", STRING, 12,
-	    "VRT_r_beresp_proto(sp)",	    "VRT_l_beresp_proto(sp, ",
+	    "VRT_r_beresp_proto(sp)",
+	    "VRT_l_beresp_proto(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.saintmode", TIME, 16,
-	    NULL,	    "VRT_l_beresp_saintmode(sp, ",
+	    NULL,
+	    "VRT_l_beresp_saintmode(sp, ",
 	    V_WO,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.status", INT, 13,
-	    "VRT_r_beresp_status(sp)",	    "VRT_l_beresp_status(sp, ",
+	    "VRT_r_beresp_status(sp)",
+	    "VRT_l_beresp_status(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.response", STRING, 15,
-	    "VRT_r_beresp_response(sp)",	    "VRT_l_beresp_response(sp, ",
+	    "VRT_r_beresp_response(sp)",
+	    "VRT_l_beresp_response(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.http.", HEADER, 12,
-	    "VRT_r_beresp_http_(sp)",	    "VRT_l_beresp_http_(sp, ",
+	    "VRT_r_beresp_http_(sp)",
+	    "VRT_l_beresp_http_(sp, ",
 	    V_RW,	    "HDR_BERESP",
 	    VCL_MET_FETCH
 	},
 	{ "beresp.cacheable", BOOL, 16,
-	    "VRT_r_beresp_cacheable(sp)",	    "VRT_l_beresp_cacheable(sp, ",
+	    "VRT_r_beresp_cacheable(sp)",
+	    "VRT_l_beresp_cacheable(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.ttl", TIME, 10,
-	    "VRT_r_beresp_ttl(sp)",	    "VRT_l_beresp_ttl(sp, ",
+	    "VRT_r_beresp_ttl(sp)",
+	    "VRT_l_beresp_ttl(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "beresp.grace", TIME, 12,
-	    "VRT_r_beresp_grace(sp)",	    "VRT_l_beresp_grace(sp, ",
+	    "VRT_r_beresp_grace(sp)",
+	    "VRT_l_beresp_grace(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_FETCH
 	},
 	{ "obj.proto", STRING, 9,
-	    "VRT_r_obj_proto(sp)",	    "VRT_l_obj_proto(sp, ",
+	    "VRT_r_obj_proto(sp)",
+	    "VRT_l_obj_proto(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_HIT | VCL_MET_ERROR
 	},
 	{ "obj.status", INT, 10,
-	    "VRT_r_obj_status(sp)",	    "VRT_l_obj_status(sp, ",
+	    "VRT_r_obj_status(sp)",
+	    "VRT_l_obj_status(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_ERROR
 	},
 	{ "obj.response", STRING, 12,
-	    "VRT_r_obj_response(sp)",	    "VRT_l_obj_response(sp, ",
+	    "VRT_r_obj_response(sp)",
+	    "VRT_l_obj_response(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_ERROR
 	},
 	{ "obj.hits", INT, 8,
-	    "VRT_r_obj_hits(sp)",	    NULL,
+	    "VRT_r_obj_hits(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_HIT | VCL_MET_DELIVER
 	},
 	{ "obj.http.", HEADER, 9,
-	    "VRT_r_obj_http_(sp)",	    "VRT_l_obj_http_(sp, ",
+	    "VRT_r_obj_http_(sp)",
+	    "VRT_l_obj_http_(sp, ",
 	    V_RW,	    "HDR_OBJ",
 	    VCL_MET_HIT | VCL_MET_ERROR
 	},
 	{ "obj.cacheable", BOOL, 13,
-	    "VRT_r_obj_cacheable(sp)",	    "VRT_l_obj_cacheable(sp, ",
+	    "VRT_r_obj_cacheable(sp)",
+	    "VRT_l_obj_cacheable(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_HIT
 	},
 	{ "obj.ttl", TIME, 7,
-	    "VRT_r_obj_ttl(sp)",	    "VRT_l_obj_ttl(sp, ",
+	    "VRT_r_obj_ttl(sp)",
+	    "VRT_l_obj_ttl(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_HIT | VCL_MET_ERROR
 	},
 	{ "obj.grace", TIME, 9,
-	    "VRT_r_obj_grace(sp)",	    "VRT_l_obj_grace(sp, ",
+	    "VRT_r_obj_grace(sp)",
+	    "VRT_l_obj_grace(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_HIT | VCL_MET_ERROR
 	},
 	{ "obj.lastuse", TIME, 11,
-	    "VRT_r_obj_lastuse(sp)",	    NULL,
+	    "VRT_r_obj_lastuse(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
 	},
 	{ "obj.hash", STRING, 8,
-	    "VRT_r_obj_hash(sp)",	    NULL,
+	    "VRT_r_obj_hash(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_MISS | VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
 	},
 	{ "resp.proto", STRING, 10,
-	    "VRT_r_resp_proto(sp)",	    "VRT_l_resp_proto(sp, ",
+	    "VRT_r_resp_proto(sp)",
+	    "VRT_l_resp_proto(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_DELIVER
 	},
 	{ "resp.status", INT, 11,
-	    "VRT_r_resp_status(sp)",	    "VRT_l_resp_status(sp, ",
+	    "VRT_r_resp_status(sp)",
+	    "VRT_l_resp_status(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_DELIVER
 	},
 	{ "resp.response", STRING, 13,
-	    "VRT_r_resp_response(sp)",	    "VRT_l_resp_response(sp, ",
+	    "VRT_r_resp_response(sp)",
+	    "VRT_l_resp_response(sp, ",
 	    V_RW,	    0,
 	    VCL_MET_DELIVER
 	},
 	{ "resp.http.", HEADER, 10,
-	    "VRT_r_resp_http_(sp)",	    "VRT_l_resp_http_(sp, ",
+	    "VRT_r_resp_http_(sp)",
+	    "VRT_l_resp_http_(sp, ",
 	    V_RW,	    "HDR_RESP",
 	    VCL_MET_DELIVER
 	},
 	{ "now", TIME, 3,
-	    "VRT_r_now(sp)",	    NULL,
+	    "VRT_r_now(sp)",
+	    NULL,
 	    V_RO,	    0,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
 	     | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER

Modified: trunk/varnish-cache/lib/libvcl/vcc_xref.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_xref.c	2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_xref.c	2009-11-19 19:03:25 UTC (rev 4358)
@@ -269,7 +269,7 @@
 	u = p->ret_bitmap & ~bitmap;
 	if (u) {
 /*lint -save -e525 -e539 */
-#define VCL_RET_MAC(l, U) 						\
+#define VCL_RET_MAC(l, U)						\
 		if (u & (1 << (VCL_RET_##U))) {				\
 			vsb_printf(tl->sb, "Invalid return \"" #l "\"\n");\
 			vcc_ErrWhere(tl, p->return_tok[VCL_RET_##U]);	\



From phk at projects.linpro.no  Tue Nov 24 16:25:10 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 17:25:10 +0100 (CET)
Subject: r4359 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091124162510.AB7E41F73DD@projects.linpro.no>

Author: phk
Date: 2009-11-24 17:25:10 +0100 (Tue, 24 Nov 2009)
New Revision: 4359

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc.c
Log:
Fix random signature recognition on 64bit OS



Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-19 19:03:25 UTC (rev 4358)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-24 16:25:10 UTC (rev 4359)
@@ -290,7 +290,7 @@
 static void
 cmd_random(CMD_ARGS)
 {
-	unsigned long l;
+	uint32_t l;
 	int i;
 
 	(void)cmd;



From phk at projects.linpro.no  Tue Nov 24 16:52:31 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 17:52:31 +0100 (CET)
Subject: r4360 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091124165231.289901F73DD@projects.linpro.no>

Author: phk
Date: 2009-11-24 17:52:30 +0100 (Tue, 24 Nov 2009)
New Revision: 4360

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc.c
   trunk/varnish-cache/bin/varnishtest/vtc.h
Log:
Add a internal macro/variable facility to varnishtest, so that we can
refer to things like servers ip/port rather than hardcode it.




Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-24 16:25:10 UTC (rev 4359)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-24 16:52:30 UTC (rev 4360)
@@ -36,12 +36,15 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <pthread.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/wait.h>
 
 #include "libvarnish.h"
 #include "vsb.h"
+#include "vqueue.h"
+#include "miniobj.h"
 
 #include "vtc.h"
 
@@ -55,6 +58,85 @@
 pthread_t	vtc_thread;
 
 /**********************************************************************
+ * Macro facility
+ */
+
+struct macro {
+	VTAILQ_ENTRY(macro)	list;
+	char			*name;
+	char			*val;
+};
+
+static VTAILQ_HEAD(,macro) macro_list = VTAILQ_HEAD_INITIALIZER(macro_list);
+
+static pthread_mutex_t		macro_mtx;
+
+static void
+init_macro(void)
+{
+	AZ(pthread_mutex_init(&macro_mtx, NULL));
+}
+
+void
+macro_def(struct vtclog *vl, const char *instance, const char *name,
+    const char *fmt, ...)
+{
+	char buf[256];
+	struct macro *m;
+	va_list ap;
+
+	if (instance != NULL) {
+		assert (snprintf(buf, sizeof buf, "%s_%s", instance, name)
+		    < sizeof buf);
+		name = buf;
+	}
+
+	AZ(pthread_mutex_lock(&macro_mtx));
+	VTAILQ_FOREACH(m, &macro_list, list)
+		if (!strcmp(name, m->name))
+			break;
+	if (m == NULL && fmt != NULL) {
+		m = calloc(sizeof *m, 1);
+		AN(m);
+		REPLACE(m->name, name);
+		VTAILQ_INSERT_TAIL(&macro_list, m, list);
+	}
+	if (fmt != NULL) {
+		AN(m);
+		va_start(ap, fmt);
+		free(m->val);
+		m->val = NULL;
+		(void)vasprintf(&m->val, fmt, ap);
+		va_end(ap);
+		AN(m->val);
+		vtc_log(vl, 2, "macro def %s=%s", m->name, m->val);
+	} else if (m != NULL) {
+		vtc_log(vl, 2, "macro undef %s", m->name);
+		VTAILQ_REMOVE(&macro_list, m, list);
+		free(m->name);
+		free(m->val);
+		free(m);
+	}
+	AZ(pthread_mutex_unlock(&macro_mtx));
+}
+
+static char *
+macro_get(const char *name)
+{
+	struct macro *m;
+
+	char *retval = NULL;
+	AZ(pthread_mutex_lock(&macro_mtx));
+	VTAILQ_FOREACH(m, &macro_list, list)
+		if (!strcmp(name, m->name))
+			break;
+	if (m != NULL)
+		retval = strdup(m->val);
+	AZ(pthread_mutex_unlock(&macro_mtx));
+	return (retval);
+}
+
+/**********************************************************************
  * Read a file into memory
  */
 
@@ -171,6 +253,14 @@
 		for (tn = 0; token_s[tn] != NULL; tn++) {
 			AN(token_e[tn]);	/*lint !e771 */
 			*token_e[tn] = '\0';	/*lint !e771 */
+			if (token_s[tn][0] == '$') {
+				q = macro_get(token_s[tn] + 1);
+				if (q == NULL)
+					vtc_log(vl, 0,
+					    "Unknown macro: \"%s\"", token_s[tn]);
+				token_s[tn] = q;
+				token_e[tn] = strchr(token_s[tn], '\0');
+			}
 		}
 
 		for (cp = cmd; cp->name != NULL; cp++)
@@ -411,6 +501,7 @@
 	if (argc == 0)
 		usage();
 
+	init_macro();
 	init_sema();
 
 	vtc_thread = pthread_self();

Modified: trunk/varnish-cache/bin/varnishtest/vtc.h
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-24 16:25:10 UTC (rev 4359)
+++ trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-24 16:52:30 UTC (rev 4360)
@@ -72,3 +72,6 @@
 void vtc_log(struct vtclog *vl, unsigned lvl, const char *fmt, ...);
 void vtc_dump(struct vtclog *vl, unsigned lvl, const char *pfx,
     const char *str);
+
+void macro_def(struct vtclog *vl, const char *instance, const char *name, const char *fmt, ...);
+



From phk at projects.linpro.no  Tue Nov 24 17:24:38 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 18:24:38 +0100 (CET)
Subject: r4361 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091124172438.B777D38195@projects.linpro.no>

Author: phk
Date: 2009-11-24 18:24:38 +0100 (Tue, 24 Nov 2009)
New Revision: 4361

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/b00004.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00102.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00251.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00255.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00262.vtc
Log:
Make sure the server is started before we try to use its address.



Modified: trunk/varnish-cache/bin/varnishtest/tests/b00004.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00004.vtc	2009-11-24 16:52:30 UTC (rev 4360)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00004.vtc	2009-11-24 17:24:38 UTC (rev 4361)
@@ -4,7 +4,7 @@
 
 server s1 {
 	rxreq
-}
+} -start
 
 varnish v1 -vcl+backend { } 
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00102.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00102.vtc	2009-11-24 16:52:30 UTC (rev 4360)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00102.vtc	2009-11-24 17:24:38 UTC (rev 4361)
@@ -7,7 +7,7 @@
 	txresp \
 		-hdr "Connection: close" \
 		-body "012345\n"
-}
+} -start
 
 varnish v1 -vcl+backend { 
 	sub vcl_recv {
@@ -17,8 +17,6 @@
 	}
 } -start 
 
-server s1 -start 
-
 client c1 {
 	txreq -req POST -url "/" \
 		-hdr "Content-Length: 10" \

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00251.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00251.vtc	2009-11-24 16:52:30 UTC (rev 4360)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00251.vtc	2009-11-24 17:24:38 UTC (rev 4361)
@@ -8,7 +8,7 @@
 		-hdr "Foobar: _barf_" \
 		-hdr "Connection: close" \
 		-body "012345\n"
-}
+} -start
 
 varnish v1 -vcl+backend { 
 	sub vcl_fetch {
@@ -19,8 +19,6 @@
 	}
 } -start 
 
-server s1 -start 
-
 client c1 {
 	txreq -url "/"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00255.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00255.vtc	2009-11-24 16:52:30 UTC (rev 4360)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00255.vtc	2009-11-24 17:24:38 UTC (rev 4361)
@@ -10,12 +10,10 @@
 	    -hdr "Last-Modified: Sun, 27 Nov 2005 05:41:47 GMT" \
 	    -hdr "Cache-Control: max-age =0" \
 	    -body "012345\n"
-}
+} -start
 
 varnish v1 -vcl+backend { sub vcl_recv {set req.backend = s1;} } -start 
 
-server s1 -start 
-
 client c1 {
 	txreq -url "/"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00262.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00262.vtc	2009-11-24 16:52:30 UTC (rev 4360)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00262.vtc	2009-11-24 17:24:38 UTC (rev 4361)
@@ -7,12 +7,10 @@
 	txresp \
 		-hdr "Connection: close" \
 		-body "012345\n"
-}
+} -start
 
 varnish v1 -arg "-p session_linger=20" -vcl+backend { } -start 
 
-server s1 -start 
-
 client c1 {
 	send "GET / HTTP/1.1\r\n\r\n\r\n"
 



From phk at projects.linpro.no  Tue Nov 24 17:36:14 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 18:36:14 +0100 (CET)
Subject: r4362 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091124173614.2D9691F73F6@projects.linpro.no>

Author: phk
Date: 2009-11-24 18:36:13 +0100 (Tue, 24 Nov 2009)
New Revision: 4362

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_server.c
Log:
Define macros for the actual ip/port bound by the server and produce
the vcl based on same.  This allows the port to be specified as
zero rather than a hardcoded number.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-24 17:24:38 UTC (rev 4361)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-24 17:36:13 UTC (rev 4362)
@@ -65,6 +65,8 @@
 	struct vss_addr		**vss_addr;
 	char			*addr;
 	char			*port;
+	char			aaddr[32];
+	char			aport[32];
 
 	pthread_t		tp;
 };
@@ -91,7 +93,7 @@
 
 	vl = vtc_logopen(s->name);
 
-	vtc_log(vl, 2, "Started on %s", s->listen);
+	vtc_log(vl, 2, "Started on %s:%s", s->aaddr, s->aport);
 	for (i = 0; i < s->repeat; i++) {
 		if (s->repeat > 1)
 			vtc_log(vl, 3, "Iteration %d", i);
@@ -105,6 +107,9 @@
 		    || errno == ENOTCONN || errno == ECONNRESET);
 		TCP_close(&fd);
 	}
+	macro_def(s->vl, s->name, "addr", NULL);
+	macro_def(s->vl, s->name, "port", NULL);
+	macro_def(s->vl, s->name, "sock", NULL);
 	vtc_log(vl, 2, "Ending");
 	return (NULL);
 }
@@ -172,9 +177,13 @@
 			    s->listen, naddr);
 		s->sock = VSS_listen(s->vss_addr[0], s->depth);
 		assert(s->sock >= 0);
+		TCP_myname(s->sock, s->aaddr, sizeof s->aaddr,
+		    s->aport, sizeof s->aport);
+		macro_def(s->vl, s->name, "addr", "%s", s->aaddr);
+		macro_def(s->vl, s->name, "port", "%s", s->aport);
+		macro_def(s->vl, s->name, "sock", "%s:%s", s->aaddr, s->aport);
 	}
-	vtc_log(s->vl, 3, "listen on %s (fd %d)",
-	    s->listen, s->sock);
+	vtc_log(s->vl, 1, "Listen on %s:%s", s->addr, s->port);
 	AZ(pthread_create(&s->tp, NULL, server_thread, s));
 }
 
@@ -210,9 +219,7 @@
 	VTAILQ_FOREACH(s, &servers, list) {
 		vsb_printf(vsb,
 		    "backend %s { .host = \"%s\"; .port = \"%s\"; }\n",
-		    s->name,
-		    s->addr == NULL ? "127.0.0.1" : s->addr,
-		    s->port);
+		    s->name, s->aaddr, s->aport);
 	}
 }
 



From phk at projects.linpro.no  Tue Nov 24 18:48:14 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 19:48:14 +0100 (CET)
Subject: r4363 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091124184814.6677A385DA@projects.linpro.no>

Author: phk
Date: 2009-11-24 19:48:14 +0100 (Tue, 24 Nov 2009)
New Revision: 4363

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc
   trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
   trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00004.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
   trunk/varnish-cache/bin/varnishtest/tests/p00001.vtc
   trunk/varnish-cache/bin/varnishtest/tests/p00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/p00005.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
   trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
Log:
Update testcases to use macros where possible (that is: client -connect)
and make the listen address explicit where we depend on it, rather
than rely on the default port to be 9080.



Modified: trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,14 +2,14 @@
 
 test "basic default HTTP transactions"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	txresp 
 }
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq 
 	rxresp
 }

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "basic default HTTP transactions with expect"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.request == GET
 	expect req.proto == HTTP/1.1
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "basic default HTTP transactions with expect and options"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.request == PUT
 	expect req.proto == HTTP/1.0
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "dual shared server HTTP transactions"
 
-server s1 -listen 127.0.0.1:9080 -repeat 2 {
+server s1 -repeat 2 {
 	rxreq
 	expect req.request == PUT
 	expect req.proto == HTTP/1.0
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -20,7 +20,7 @@
 	expect resp.msg == Foo
 }
 
-client c2 -connect 127.0.0.1:9080 {
+client c2 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "bidirectional message bodies"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.request == PUT
 	expect req.proto == HTTP/1.0
@@ -13,7 +13,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo \
 		-body "123456789\n"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "TCP reuse"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.url == "/1"
 	txresp -body "123456789\n"
@@ -13,7 +13,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -url "/1" -req "POST" -body "abcdefghi\n"
 	rxresp
 	txreq -url "/2" -req "POST" -body "ihgfedcba\n"

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "simply test that the framework support \0"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
         rxreq
 	expect req.url == "/"
 	txresp -body {a\0bc}
@@ -10,7 +10,7 @@
 
 server s1 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 
 	txreq
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Check the between_bytes_timeout behaves from backend definition"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
 	rxreq
 	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
 	delay 1.5

Modified: trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Check that the first_byte_timeout works from backend definition"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
 	rxreq
 	delay 1.5
 	txresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00004.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00004.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00004.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,8 +2,6 @@
 
 test "Test Vary functionality"
 
-varnish v1 -arg "-b 127.0.0.1:9080" -start
-
 server s1 {
 	rxreq
 	expect req.http.foobar == "1"
@@ -18,6 +16,8 @@
 	txresp -hdr "Vary: Foobar" -hdr "Snafu: 4" -body "4444\n"
 } -start
 
+varnish v1 -vcl+backend {} -start
+
 client c1 {
 	txreq -hdr "Foobar: 1"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,6 +2,12 @@
 
 test "Test Backend Polling"
 
+server s1 -listen 127.0.0.1:9080 {
+	rxreq
+	expect req.url == "/"
+	txresp -hdr "Bar: foo" -body "foobar" 
+} -start
+
 varnish v1 -vcl { 
 
 	backend foo {
@@ -15,11 +21,6 @@
 	
 } -start
 
-server s1 {
-	rxreq
-	expect req.url == "/"
-	txresp -hdr "Bar: foo" -body "foobar" 
-} 
 
 # Handle  probes
 server s1 -start -wait

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Test restart in vcl_error"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
         rxreq 
         txresp 
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Test that saintmode_threshold in VCL"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
 	rxreq
 	txresp
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/p00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/p00001.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/p00001.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -22,7 +22,6 @@
 } -run
 
 varnish v1 -stop
-server s1 -wait
 
 varnish v1 -vcl+backend {
 	sub vcl_hit {
@@ -30,6 +29,8 @@
 	}
 }
 
+server s1 -wait
+
 varnish v1 -start
 
 client c1 {
@@ -42,17 +43,17 @@
 
 varnish v1 -stop
 
+server s1 {
+	rxreq 
+	txresp -hdr "Foo: bar"
+} -start
+
 varnish v1 -vcl+backend { }
 
 delay 2
 
 varnish v1 -start
 
-server s1 {
-	rxreq 
-	txresp -hdr "Foo: bar"
-} -start
-
 client c1 {
 	txreq -url "/"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/p00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/p00003.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/p00003.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -34,7 +34,7 @@
 	txresp -hdr "Foo: bar"
 } -start
 
-varnish v1 -start
+varnish v1 -vcl+backend {} -start
 
 varnish v1 -cliok purge.list
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/p00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/p00005.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/p00005.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -35,7 +35,11 @@
 	txresp -hdr "Foo: foo2"
 } -start
 
-varnish v1 -start
+varnish v1 -vcl+backend {
+		sub vcl_fetch {
+			set beresp.ttl = 3s;
+		}
+	} -start
 
 delay 5
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Regression test for ticket #306, random director ignoring good backend"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
 
 	rxreq
 	expect req.url == /foo

Modified: trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/s00003.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Check saint mode with sick pages"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	timeout 10
 
 	rxreq
@@ -16,8 +16,7 @@
 	txresp -status 200 -hdr "foo: 3"
 } -start
 
-varnish v1 -vcl {
-	backend b { .host = "127.0.0.1"; .port = "9080"; }
+varnish v1 -vcl+backend {
 	sub vcl_fetch {
 		set beresp.ttl = 1s;
 		set beresp.grace = 10m;

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -4,17 +4,13 @@
 
 # First do one request to get a work-thread that holds a VCL reference
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	txresp
 } -start
 
 # Only one pool, to avoid getting more than one work thread
-varnish v1 -arg "-p thread_pools=1 -w1,1,300" -vcl {
-	backend b1 {
-		.host = "127.0.0.1";
-		.port = "9080";
-	}
+varnish v1 -arg "-p thread_pools=1 -w1,1,300" -vcl+backend {
 } -start
 
 client c1 {

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc	2009-11-24 17:36:13 UTC (rev 4362)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc	2009-11-24 18:48:14 UTC (rev 4363)
@@ -2,7 +2,7 @@
 
 test "Check backend connection limit"
 
-server s1 {
+server s1 -listen 127.0.0.1:9080 {
 	rxreq
 	sema r1 sync 2
 	sema r2 sync 2



From phk at projects.linpro.no  Tue Nov 24 19:08:39 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 20:08:39 +0100 (CET)
Subject: r4364 - in trunk/varnish-cache/bin/varnishtest: . tests
Message-ID: <20091124190839.612F6385DA@projects.linpro.no>

Author: phk
Date: 2009-11-24 20:08:39 +0100 (Tue, 24 Nov 2009)
New Revision: 4364

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc
   trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00009.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00022.vtc
   trunk/varnish-cache/bin/varnishtest/vtc_server.c
Log:
Let servers pick a randomly assigned TCP port, if nothing is
explicitly specified, and use macros to pick up the result
as necessary.



Modified: trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -2,7 +2,7 @@
 
 test "dual independent HTTP transactions"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.request == PUT
 	expect req.proto == HTTP/1.0
@@ -10,7 +10,7 @@
 	txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s2 -listen 127.0.0.1:9081 {
+server s2 {
 	rxreq
 	expect req.request == GET
 	expect req.proto == HTTP/1.1
@@ -21,7 +21,7 @@
 server s1 -start 
 server s2 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -29,7 +29,7 @@
 	expect resp.msg == Foo
 }
 
-client c2 -connect 127.0.0.1:9081 {
+client c2 -connect $s2_sock {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -2,7 +2,7 @@
 
 test "dual shared client HTTP transactions"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.request == PUT
 	expect req.proto == HTTP/1.0
@@ -10,7 +10,7 @@
 	txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s2 -listen 127.0.0.1:9081 {
+server s2 {
 	rxreq
 	expect req.request == GET
 	expect req.proto == HTTP/1.1
@@ -21,7 +21,7 @@
 server s1 -start 
 server s2 -start 
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -31,7 +31,7 @@
 
 client c1 -run
 
-client c1 -connect 127.0.0.1:9081 {
+client c1 -connect $s2_sock {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -2,42 +2,42 @@
 
 test "Sema operations"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	sema r1 sync 4
 	delay .9
 	txresp
 } -start
 
-server s2 -listen 127.0.0.1:9081 {
+server s2 {
 	rxreq
 	sema r1 sync 4
 	delay .6
 	txresp
 } -start
 
-server s3 -listen 127.0.0.1:9082 {
+server s3 {
 	rxreq
 	sema r1 sync 4
 	delay .2
 	txresp
 } -start
 
-client c1 -connect 127.0.0.1:9080 {
+client c1 -connect $s1_sock {
 	delay .2
 	txreq
 	rxresp
 	sema r1 sync 4
 } -start
 
-client c2 -connect 127.0.0.1:9081 {
+client c2 -connect $s2_sock {
 	delay .6
 	txreq
 	rxresp
 	sema r1 sync 4
 } -start
 
-client c3 -connect 127.0.0.1:9082 {
+client c3 -connect $s3_sock {
 	delay .9
 	txreq
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00009.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -8,7 +8,7 @@
 	txresp -status 404 
 } -start
 
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	expect req.url == "/foo"
 	txresp -body "foobar"

Modified: trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -15,7 +15,7 @@
 } -start
 
 
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	expect req.url == "/body"
 	txresp -body {

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -18,7 +18,7 @@
 
 } -start
 
-server s2 -listen 127.0.0.1:9082 {
+server s2 {
 	rxreq
 	expect req.url == "/bar"
 	txresp -body "bar"

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00009.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00009.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00009.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -2,23 +2,23 @@
 
 test "Test round robin director"
 
-server s1 -listen 127.0.0.1:2000 {
+server s1 {
 	rxreq
 	txresp -body "1"
 } -start
 
-server s2 -listen 127.0.0.1:3000 {
+server s2 {
 	rxreq
 	txresp -body "22"
 } -start
 
 
-server s3 -listen 127.0.0.1:4000 {
+server s3 {
 	rxreq
 	txresp -body "333"
 } -start
 
-server s4 -listen 127.0.0.1:5000 {
+server s4 {
 	rxreq
 	txresp -body "4444"
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00022.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00022.vtc	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00022.vtc	2009-11-24 19:08:39 UTC (rev 4364)
@@ -8,7 +8,7 @@
 	rxreq
 	txresp -body "1"
 } -start
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	txresp -body "22"
 	rxreq
@@ -16,11 +16,11 @@
 	rxreq
 	txresp -body "22"
 } -start
-server s3 -listen 127.0.0.1:9181 {
+server s3 {
 	rxreq
 	txresp -body "333"
 } -start
-server s4 -listen 127.0.0.1:9182 {
+server s4 {
 	rxreq
 	txresp -body "4444"
 	rxreq

Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-24 18:48:14 UTC (rev 4363)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-24 19:08:39 UTC (rev 4364)
@@ -132,7 +132,7 @@
 	if (*s->name != 's')
 		vtc_log(s->vl, 0, "Server name must start with 's'");
 
-	REPLACE(s->listen, "127.0.0.1:9080");
+	REPLACE(s->listen, "127.0.0.1:0");
 	AZ(VSS_parse(s->listen, &s->addr, &s->port));
 	s->repeat = 1;
 	s->depth = 1;



From phk at projects.linpro.no  Tue Nov 24 19:41:09 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 20:41:09 +0100 (CET)
Subject: r4365 - in trunk/varnish-cache/bin/varnishtest: . tests
Message-ID: <20091124194109.C2664385DA@projects.linpro.no>

Author: phk
Date: 2009-11-24 20:41:09 +0100 (Tue, 24 Nov 2009)
New Revision: 4365

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc
   trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc
   trunk/varnish-cache/bin/varnishtest/vtc.c
Log:
Change the macro expansion syntax to ${foobar}, it's much easier to
parse.



Modified: trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00000.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -9,7 +9,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq 
 	rxresp
 }

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00001.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00002.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00003.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -21,7 +21,7 @@
 server s1 -start 
 server s2 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -29,7 +29,7 @@
 	expect resp.msg == Foo
 }
 
-client c2 -connect $s2_sock {
+client c2 -connect ${s2_sock} {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00004.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -12,7 +12,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -20,7 +20,7 @@
 	expect resp.msg == Foo
 }
 
-client c2 -connect $s1_sock {
+client c2 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00005.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -21,7 +21,7 @@
 server s1 -start 
 server s2 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo
 	rxresp
 	expect resp.proto == HTTP/1.2
@@ -31,7 +31,7 @@
 
 client c1 -run
 
-client c1 -connect $s2_sock {
+client c1 -connect ${s2_sock} {
 	txreq 
 	rxresp
 	expect resp.proto == HTTP/1.1

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00006.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -13,7 +13,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -req PUT -proto HTTP/1.0 -url /foo \
 		-body "123456789\n"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00007.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -13,7 +13,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	txreq -url "/1" -req "POST" -body "abcdefghi\n"
 	rxresp
 	txreq -url "/2" -req "POST" -body "ihgfedcba\n"

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00008.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -23,21 +23,21 @@
 	txresp
 } -start
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 	delay .2
 	txreq
 	rxresp
 	sema r1 sync 4
 } -start
 
-client c2 -connect $s2_sock {
+client c2 -connect ${s2_sock} {
 	delay .6
 	txreq
 	rxresp
 	sema r1 sync 4
 } -start
 
-client c3 -connect $s3_sock {
+client c3 -connect ${s3_sock} {
 	delay .9
 	txreq
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/tests/a00010.vtc	2009-11-24 19:41:09 UTC (rev 4365)
@@ -10,7 +10,7 @@
 
 server s1 -start 
 
-client c1 -connect $s1_sock {
+client c1 -connect ${s1_sock} {
 
 	txreq
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-24 19:08:39 UTC (rev 4364)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-24 19:41:09 UTC (rev 4365)
@@ -136,6 +136,38 @@
 	return (retval);
 }
 
+static struct vsb *
+macro_expand(char *name)
+{
+	struct vsb *vsb;
+	char *p, *q;
+
+	vsb = vsb_newauto();
+	AN(vsb);
+	while (*name != '\0') {
+		p = strstr(name, "${");
+		if (p == NULL) {
+			vsb_cat(vsb, name);
+			break;
+		}
+		vsb_bcat(vsb, name, p - name);
+		q = strchr(p, '}');
+		if (q == NULL) {
+			vsb_cat(vsb, name);
+			break;
+		}
+		assert(p[0] == '$');
+		assert(p[1] == '{');
+		assert(q[0] == '}');
+		p += 2;
+		*q = '\0';
+		vsb_cat(vsb, macro_get(p));
+		name = q + 1;
+	}
+	vsb_finish(vsb);
+	return (vsb);
+}
+
 /**********************************************************************
  * Read a file into memory
  */
@@ -174,6 +206,7 @@
 parse_string(char *buf, const struct cmds *cmd, void *priv, struct vtclog *vl)
 {
 	char *token_s[MAX_TOKENS], *token_e[MAX_TOKENS];
+	struct vsb *token_exp[MAX_TOKENS];
 	char *p, *q;
 	int nest_brace;
 	int tn;
@@ -251,16 +284,14 @@
 		assert(tn < MAX_TOKENS);
 		token_s[tn] = NULL;
 		for (tn = 0; token_s[tn] != NULL; tn++) {
+			token_exp[tn] = NULL;
 			AN(token_e[tn]);	/*lint !e771 */
 			*token_e[tn] = '\0';	/*lint !e771 */
-			if (token_s[tn][0] == '$') {
-				q = macro_get(token_s[tn] + 1);
-				if (q == NULL)
-					vtc_log(vl, 0,
-					    "Unknown macro: \"%s\"", token_s[tn]);
-				token_s[tn] = q;
-				token_e[tn] = strchr(token_s[tn], '\0');
-			}
+			if (NULL == strstr(token_s[tn], "${"))
+				continue;
+			token_exp[tn] = macro_expand(token_s[tn]);
+			token_s[tn] = vsb_data(token_exp[tn]);
+			token_e[tn] = strchr(token_s[tn], '\0');
 		}
 
 		for (cp = cmd; cp->name != NULL; cp++)



From phk at projects.linpro.no  Tue Nov 24 20:02:34 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Tue, 24 Nov 2009 21:02:34 +0100 (CET)
Subject: r4366 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091124200234.14DEE1F7400@projects.linpro.no>

Author: phk
Date: 2009-11-24 21:02:33 +0100 (Tue, 24 Nov 2009)
New Revision: 4366

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
   trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
   trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
   trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
   trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc
Log:
Eliminate as many hardcoded addresses as possible using macros
in VCL snippets.



Modified: trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Check the between_bytes_timeout behaves from backend definition"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
 	delay 1.5
@@ -11,8 +11,8 @@
 
 varnish v1 -vcl {
 	backend b1 {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.between_bytes_timeout = 1s;
 	}
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Check that the first_byte_timeout works from backend definition"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	delay 1.5
 	txresp
@@ -10,8 +10,8 @@
 
 varnish v1 -vcl {
 	backend b1 {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.first_byte_timeout = 1s;
 	}
 } -start

Modified: trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,13 +2,13 @@
 
 test "Check the precedence for timeouts"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	expect req.url == "from_backend"
 	delay 1; 
 	txresp
 } -start
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	expect req.url == "from_vcl"
 	delay 1.5;
@@ -17,13 +17,13 @@
 
 varnish v1 -vcl {
 	backend b1 {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.first_byte_timeout = 2s;
 	}
 	backend b2 {
-		.host = "127.0.0.1";
-		.port = "9180";
+		.host = "${s2_addr}";
+		.port = "${s2_port}";
 		.first_byte_timeout = 1s;
 	}
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,19 +2,22 @@
 
 test "Test restart in vcl_error"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
         rxreq 
         txresp 
 } -start
 
+server s2 {
+} -start
+
 varnish v1 -vcl { 
 	backend bad { 
-		.host = "127.0.0.1";
-		.port = "9099";
+		.host = "${s2_addr}";
+		.port = "${s2_port}";
 	}
 	backend good { 
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 	}
 	sub vcl_recv {
 		if (req.restarts > 0) {

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Test that saintmode_threshold in VCL"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	txresp
 
@@ -30,8 +30,8 @@
 
 varnish v1 -arg "-p saintmode_threshold=10" -vcl {
 	backend foo {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.saintmode_threshold = 2;
 	}
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Regression test for ticket #306, random director ignoring good backend"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 
 	rxreq
 	expect req.url == /foo
@@ -14,17 +14,17 @@
 
 } -start
 
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	txresp -status 404
 } -start
 
 varnish v1 -vcl {
 	backend s1 {
-		.host = "127.0.0.1"; .port = "9080";
+		.host = "${s1_addr}"; .port = "${s1_port}";
 	}
 	backend s2 {
-		.host = "127.0.0.1"; .port = "9180";
+		.host = "${s2_addr}"; .port = "${s2_port}";
 		.probe = {
 			.url = "/";
 			.initial = 0;

Modified: trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Check grace with sick backends"
 
-server s1 -listen 127.0.0.1:9080 -repeat 4 {
+server s1 -repeat 4 {
 	rxreq
 	expect req.url == "/"
 	txresp -body "hi"
@@ -10,8 +10,8 @@
 
 varnish v1 -vcl {
 	backend b { 
-		.host = "127.0.0.1"; 
-		.port = "9080"; 
+		.host = "${s1_addr}"; 
+		.port = "${s1_port}"; 
 		.probe = { 
 			.url = "/"; 
 			.timeout = 30ms; 

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -27,15 +27,15 @@
 
 # Set up a new VCL and backend
 
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	txresp
 } -start
 
 varnish v1 -vcl {
 	backend b2 {
-		.host = "127.0.0.1";
-		.port = "9180";
+		.host = "${s2_addr}";
+		.port = "${s2_port}";
 	}
 }
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -23,7 +23,7 @@
 	rxresp
 } -run
 
-server s2 -listen 127.0.0.1:9180 {
+server s2 {
 	rxreq
 	expect req.url == "/barf"
 	expect req.http.host == "FOObar"
@@ -32,8 +32,8 @@
 
 varnish v1 -vcl {
 	backend b1 {
-		.host = "127.0.0.1";
-		.port = "9180";
+		.host = "${s2_addr}";
+		.port = "${s2_port}";
 		.host_header = "FOObar";
 	}
 } 

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -2,7 +2,7 @@
 
 test "Check backend connection limit"
 
-server s1 -listen 127.0.0.1:9080 {
+server s1 {
 	rxreq
 	sema r1 sync 2
 	sema r2 sync 2
@@ -12,8 +12,8 @@
 varnish v1 -vcl {
 
 	backend default {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.max_connections = 1;
 	}
 	sub vcl_recv {

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc	2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc	2009-11-24 20:02:33 UTC (rev 4366)
@@ -11,8 +11,8 @@
 varnish v1 -vcl {
 
 	backend default {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.max_connections = 1;
 		.probe = {
 			.url = "/";



From phk at projects.linpro.no  Wed Nov 25 09:49:15 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 10:49:15 +0100 (CET)
Subject: r4367 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091125094915.BB1D097D0E@projects.linpro.no>

Author: phk
Date: 2009-11-25 10:49:15 +0100 (Wed, 25 Nov 2009)
New Revision: 4367

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc.h
   trunk/varnish-cache/bin/varnishtest/vtc_client.c
   trunk/varnish-cache/bin/varnishtest/vtc_http.c
   trunk/varnish-cache/bin/varnishtest/vtc_server.c
Log:
Add a "accept" (server only) and "loop" action to the HTTP specs.



Modified: trunk/varnish-cache/bin/varnishtest/vtc.h
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-24 20:02:33 UTC (rev 4366)
+++ trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-25 09:49:15 UTC (rev 4367)
@@ -63,7 +63,7 @@
 
 void init_sema(void);
 
-void http_process(struct vtclog *vl, const char *spec, int sock, int client);
+void http_process(struct vtclog *vl, const char *spec, int sock, int sfd);
 
 void cmd_server_genvcl(struct vsb *vsb);
 

Modified: trunk/varnish-cache/bin/varnishtest/vtc_client.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-24 20:02:33 UTC (rev 4366)
+++ trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-25 09:49:15 UTC (rev 4367)
@@ -96,7 +96,7 @@
 		}
 		assert(fd >= 0);
 		vtc_log(vl, 3, "Connected to %s fd is %d", c->connect, fd);
-		http_process(vl, c->spec, fd, 1);
+		http_process(vl, c->spec, fd, -1);
 		vtc_log(vl, 3, "Closing fd %d", fd);
 		TCP_close(&fd);
 	}

Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-24 20:02:33 UTC (rev 4366)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-25 09:49:15 UTC (rev 4367)
@@ -40,6 +40,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include "libvarnish.h"
 #include "vct.h"
 #include "miniobj.h"
@@ -53,7 +56,7 @@
 	unsigned		magic;
 #define HTTP_MAGIC		0x2f02169c
 	int			fd;
-	int			client;
+	int			sfd;
 	int			timeout;
 	struct vtclog		*vl;
 
@@ -69,6 +72,21 @@
 	char			*resp[MAX_HDR];
 };
 
+#define ONLY_CLIENT(hp, av)						\
+	do {								\
+		if (hp->sfd >= 0)					\
+			vtc_log(hp->vl, 0,				\
+			    "\"%s\" only possible in client", av[0]);	\
+	} while (0)
+
+#define ONLY_SERVER(hp, av)						\
+	do {								\
+		if (hp->sfd < 0)					\
+			vtc_log(hp->vl, 0,				\
+			    "\"%s\" only possible in server", av[0]);	\
+	} while (0)
+			    
+
 /* XXX: we may want to vary this */
 static const char * const nl = "\r\n";
 
@@ -452,7 +470,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AN(hp->client);
+	ONLY_CLIENT(hp, av);
 	assert(!strcmp(av[0], "rxresp"));
 	av++;
 
@@ -486,7 +504,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AZ(hp->client);
+	ONLY_SERVER(hp, av);
 	assert(!strcmp(av[0], "txresp"));
 	av++;
 
@@ -563,7 +581,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AZ(hp->client);
+	ONLY_SERVER(hp, av);
 	assert(!strcmp(av[0], "rxreq"));
 	av++;
 
@@ -584,7 +602,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AZ(hp->client);
+	ONLY_SERVER(hp, av);
 	assert(!strcmp(av[0], "rxhdrs"));
 	av++;
 
@@ -603,7 +621,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AZ(hp->client);
+	ONLY_SERVER(hp, av);
 	assert(!strcmp(av[0], "rxbody"));
 	av++;
 
@@ -630,7 +648,7 @@
 	(void)cmd;
 	(void)vl;
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	AN(hp->client);
+	ONLY_CLIENT(hp, av);
 	assert(!strcmp(av[0], "txreq"));
 	av++;
 
@@ -739,6 +757,48 @@
 }
 
 /**********************************************************************
+ * close and accept a new connection
+ */
+
+static void
+cmd_http_accept(CMD_ARGS)
+{
+	struct http *hp;
+
+	(void)cmd;
+	(void)vl;
+	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
+	AZ(av[1]);
+	assert(hp->sfd >= 0);
+	TCP_close(&hp->fd);
+	hp->fd = accept(hp->sfd, NULL, NULL);
+}
+
+/**********************************************************************
+ * loop operator
+ */
+
+static void
+cmd_http_loop(CMD_ARGS)
+{
+	struct http *hp;
+	unsigned n, m;
+	char *s;
+
+	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
+	AN(av[1]);
+	AN(av[2]);
+	AZ(av[3]);
+	n = strtod(av[1], NULL);
+	for (m = 1 ; m <= n; m++) {
+		vtc_log(vl, 4, "Loop #%u", m);
+		s = strdup(av[2]);
+		AN(s);
+		parse_string(s, cmd, hp, vl);
+	}
+}
+
+/**********************************************************************
  * Execute HTTP specifications
  */
 
@@ -757,24 +817,27 @@
 	{ "chunked",	cmd_http_chunked },
 	{ "delay",	cmd_delay },
 	{ "sema",	cmd_sema },
+	{ "accept",	cmd_http_accept },
+	{ "loop",	cmd_http_loop },
 	{ NULL,		NULL }
 };
 
 void
-http_process(struct vtclog *vl, const char *spec, int sock, int client)
+http_process(struct vtclog *vl, const char *spec, int sock, int sfd)
 {
 	struct http *hp;
 	char *s, *q;
 
+	(void)sfd;
 	ALLOC_OBJ(hp, HTTP_MAGIC);
 	AN(hp);
 	hp->fd = sock;
-	hp->vl = vl;
-	hp->client = client;
 	hp->timeout = 3000;
 	hp->nrxbuf = 640*1024;
 	hp->vsb = vsb_newauto();
 	hp->rxbuf = malloc(hp->nrxbuf);		/* XXX */
+	hp->sfd = sfd;
+	hp->vl = vl;
 	AN(hp->rxbuf);
 	AN(hp->vsb);
 

Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-24 20:02:33 UTC (rev 4366)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c	2009-11-25 09:49:15 UTC (rev 4367)
@@ -101,7 +101,7 @@
 		l = sizeof addr_s;
 		fd = accept(s->sock, addr, &l);
 		vtc_log(vl, 3, "Accepted socket fd is %d", fd);
-		http_process(vl, s->spec, fd, 0);
+		http_process(vl, s->spec, fd, s->sock);
 		vtc_log(vl, 3, "shutting fd %d", fd);
 		assert((shutdown(fd, SHUT_WR) == 0)
 		    || errno == ENOTCONN || errno == ECONNRESET);



From phk at projects.linpro.no  Wed Nov 25 09:54:19 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 10:54:19 +0100 (CET)
Subject: r4368 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091125095419.C1C7F97D0E@projects.linpro.no>

Author: phk
Date: 2009-11-25 10:54:19 +0100 (Wed, 25 Nov 2009)
New Revision: 4368

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc
Log:
Rewrite this testcase with new accept and loop primitives so we can avoid
the hardcoded server port here also



Modified: trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc	2009-11-25 09:49:15 UTC (rev 4367)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00017.vtc	2009-11-25 09:54:19 UTC (rev 4368)
@@ -2,63 +2,44 @@
 
 test "Test Backend Polling"
 
-server s1 -listen 127.0.0.1:9080 {
-	rxreq
-	expect req.url == "/"
-	txresp -hdr "Bar: foo" -body "foobar" 
+server s1 {
+	# Probes 
+	loop 8 {
+		rxreq
+		expect req.url == "/"
+		txresp -hdr "Bar: foo" -body "foobar" 
+		accept
+	}
+
+	loop 3 {
+		rxreq
+		expect req.url == "/"
+		txresp -status 404 -hdr "Bar: foo" -body "foobar" 
+		accept
+	}
+	loop 2 {
+		rxreq
+		expect req.url == "/"
+		txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "foobar" 
+		accept
+	}
+
+	sema r1 sync 2
 } -start
 
 varnish v1 -vcl { 
 
 	backend foo {
-		.host = "127.0.0.1";
-		.port = "9080";
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
 		.probe = {
 			.timeout = 1 s;
-			.interval = 0.5 s;
+			.interval = 0.1 s;
 		}
 	}
 	
 } -start
 
+sema r1 sync 2
 
-# Handle  probes
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-server s1 -start -wait
-
-server s1 {
-	rxreq
-	expect req.url == "/"
-	txresp -status 404 -hdr "Bar: foo" -body "foobar" 
-} -start -wait
-
-server s1 {
-	rxreq
-	expect req.url == "/"
-	txresp -status 200 -hdr "Bar: foo" -body "foobar" 
-} -start -wait
-
-server s1 {
-	rxreq
-	expect req.url == "/"
-	txresp -proto "FROBOZ" -status 200 -hdr "Bar: foo" -body "foobar" 
-} -start -wait
-
-server s1 {
-} -start -wait
-
-server s1 {
-	rxreq
-	expect req.url == "/"
-	delay 2
-} -start -wait
-
-delay 2
-
 varnish v1 -cli "debug.health"



From phk at projects.linpro.no  Wed Nov 25 10:18:19 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 11:18:19 +0100 (CET)
Subject: r4369 - trunk/varnish-cache/bin/varnishd
Message-ID: <20091125101819.8D10628117@projects.linpro.no>

Author: phk
Date: 2009-11-25 11:18:19 +0100 (Wed, 25 Nov 2009)
New Revision: 4369

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
Log:
Add a debug.listen_address cli command to report the actual listen
address(es)



Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2009-11-25 09:54:19 UTC (rev 4368)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2009-11-25 10:18:19 UTC (rev 4369)
@@ -353,16 +353,46 @@
 	VSL(SLT_Debug, 0, "Acceptor is %s", vca_act->name);
 }
 
+/*--------------------------------------------------------------------*/
+
+static void
+ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
+{
+	struct listen_sock *ls;
+	char h[32], p[32];
+
+	(void)cli;
+	(void)av;
+	(void)priv;
+	VTAILQ_FOREACH(ls, &heritage.socks, list) {
+		if (ls->sock < 0)
+			continue;
+		TCP_myname(ls->sock, h, sizeof h, p, sizeof p);
+		cli_out(cli, "%s %s\n", h, p);
+	}
+}
+
+/*--------------------------------------------------------------------*/
+
 static struct cli_proto vca_cmds[] = {
 	{ CLI_SERVER_START,	ccf_start },
 	{ NULL }
 };
 
+static struct cli_proto vca_debug_cmds[] = {
+	{ "debug.listen_address",
+	    "debug.listen_address",
+	    "Report the actual listen address\n", 0, 0,
+	    ccf_listen_address, NULL },
+	{ NULL }
+};
+
 void
 VCA_Init(void)
 {
 
 	CLI_AddFuncs(MASTER_CLI, vca_cmds);
+	CLI_AddFuncs(DEBUG_CLI, vca_debug_cmds);
 }
 
 void



From phk at projects.linpro.no  Wed Nov 25 12:48:43 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 13:48:43 +0100 (CET)
Subject: r4370 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091125124843.BEA8C97D0E@projects.linpro.no>

Author: phk
Date: 2009-11-25 13:48:43 +0100 (Wed, 25 Nov 2009)
New Revision: 4370

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_http.c
Log:
Log write errors instead of asserting them.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-25 10:18:19 UTC (rev 4369)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-25 12:48:43 UTC (rev 4370)
@@ -138,7 +138,8 @@
 	AZ(vsb_overflowed(hp->vsb));
 	vtc_dump(hp->vl, lvl, pfx, vsb_data(hp->vsb));
 	l = write(hp->fd, vsb_data(hp->vsb), vsb_len(hp->vsb));
-	assert(l == vsb_len(hp->vsb));
+	if (l != vsb_len(hp->vsb)) 
+		vtc_log(hp->vl, 0, "Write failed: %s", strerror(errno));
 }
 
 /**********************************************************************



From phk at projects.linpro.no  Wed Nov 25 13:00:22 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 14:00:22 +0100 (CET)
Subject: r4371 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091125130022.CB76997D0E@projects.linpro.no>

Author: phk
Date: 2009-11-25 14:00:22 +0100 (Wed, 25 Nov 2009)
New Revision: 4371

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Define macros with the varnish port



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-25 12:48:43 UTC (rev 4370)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-25 13:00:22 UTC (rev 4371)
@@ -314,6 +314,7 @@
 varnish_start(struct varnish *v)
 {
 	enum cli_status_e u;
+	char *resp, *h, *p, *q;
 
 	if (v->cli_fd < 0)
 		varnish_launch(v);
@@ -328,6 +329,21 @@
 	if (vtc_error)
 		return;
 	assert(u == CLIS_OK);
+	u = varnish_ask_cli(v, "debug.listen_address", &resp);
+	if (vtc_error)
+		return;
+	assert(u == CLIS_OK);
+	h = resp;
+	p = strchr(h, ' ');
+	AN(p);
+	*p++ = '\0';
+	q = strchr(p, '\n');
+	AN(q);
+	*q = '\0';
+	vtc_log(v->vl, 2, "Listen on %s %s", h, p);
+	macro_def(v->vl, v->name, "addr", "%s", h);
+	macro_def(v->vl, v->name, "port", "%s", p);
+	macro_def(v->vl, v->name, "sock", "%s:%s", h, p);
 }
 
 /**********************************************************************
@@ -343,6 +359,9 @@
 		varnish_launch(v);
 	if (vtc_error)
 		return;
+	macro_def(v->vl, v->name, "addr", NULL);
+	macro_def(v->vl, v->name, "port", NULL);
+	macro_def(v->vl, v->name, "sock", NULL);
 	vtc_log(v->vl, 2, "Stop");
 	(void)varnish_ask_cli(v, "stop", NULL);
 	while (1) {



From phk at projects.linpro.no  Wed Nov 25 13:18:46 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Wed, 25 Nov 2009 14:18:46 +0100 (CET)
Subject: r4372 - in trunk/varnish-cache/bin/varnishtest: . tests
Message-ID: <20091125131846.65BF297D0E@projects.linpro.no>

Author: phk
Date: 2009-11-25 14:18:46 +0100 (Wed, 25 Nov 2009)
New Revision: 4372

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/b00014.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00003.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc
   trunk/varnish-cache/bin/varnishtest/vtc.c
   trunk/varnish-cache/bin/varnishtest/vtc.h
   trunk/varnish-cache/bin/varnishtest/vtc_client.c
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Have clients pick up the varnish accept address using macros.

Make the varnish accept address just use a random free TCP port.

Fix a couple of tests where we need to know the port number.



Modified: trunk/varnish-cache/bin/varnishtest/tests/b00014.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00014.vtc	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00014.vtc	2009-11-25 13:18:46 UTC (rev 4372)
@@ -2,8 +2,6 @@
 
 test "Check -f command line arg"
 
-shell "echo 'backend foo { .host = \"127.0.0.1\"; .port = \"9080\"; }' > /tmp/_b00014.vcl" 
-varnish v1 -arg "-f /tmp/_b00014.vcl" -start
 
 server s1 {
 	rxreq 
@@ -14,6 +12,9 @@
 	txresp -body "bar"
 } -start
 
+shell "echo 'backend foo { .host = \"${s1_addr}\"; .port = \"${s1_port}\"; }' > /tmp/_b00014.vcl" 
+varnish v1 -arg "-f /tmp/_b00014.vcl" -start
+
 client c1 {
 	txreq -url /foo
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00003.vtc	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00003.vtc	2009-11-25 13:18:46 UTC (rev 4372)
@@ -13,7 +13,7 @@
 # Benchmark Testing
 varnish v1 -cliok "param.set listen_address 198.18.1.1:9082"
 varnish v1 -vcl+backend {} -clierr 300 start
-varnish v1 -cliok "param.set listen_address :9081,127.0.0.2:9082"
+varnish v1 -cliok "param.set listen_address 127.0.0.1:9081,127.0.0.2:9082"
 varnish v1 -start
 
 client c1 {

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc	2009-11-25 13:18:46 UTC (rev 4372)
@@ -8,6 +8,9 @@
 	rxreq
 	txresp -hdr "Panic: please" -body "012345\n"
 	sema r1 sync 2
+	accept
+	rxreq
+	txresp -hdr "Foo: foo" -body "abcdef\n"
 } -start
 
 varnish v1 -vcl+backend {
@@ -19,8 +22,13 @@
 	}
 } -start
 
-varnish v1 -cliok "param.set diag_bitmap 0x00001000" 
+varnish v1 -cliok "param.set diag_bitmap 0x00001000"
 
+# We have to force a known listen address otherwise the client cannot find
+# the varnish after the restart.
+
+varnish v1 -cliok "param.set listen_address 127.0.0.1:9080" -stop -start
+
 # varnishtest defaults to auto_restart off, to avoid masking bugs.
 varnish v1 -cliok "param.set auto_restart on" 
 
@@ -31,13 +39,9 @@
 	txreq -url "/foo"
 	# Don't expect answer, the server crashed.
 	sema r1 sync 2
-	delay 2.5
 } -run
 
-server s1 {
-	rxreq
-	txresp -hdr "Foo: foo" -body "abcdef\n"
-} -start
+delay 2.5
 
 client c1 {
 	txreq -url "/"

Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-25 13:18:46 UTC (rev 4372)
@@ -136,7 +136,7 @@
 	return (retval);
 }
 
-static struct vsb *
+struct vsb *
 macro_expand(char *name)
 {
 	struct vsb *vsb;

Modified: trunk/varnish-cache/bin/varnishtest/vtc.h
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-25 13:18:46 UTC (rev 4372)
@@ -74,4 +74,4 @@
     const char *str);
 
 void macro_def(struct vtclog *vl, const char *instance, const char *name, const char *fmt, ...);
-
+struct vsb *macro_expand(char *name);

Modified: trunk/varnish-cache/bin/varnishtest/vtc_client.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/vtc_client.c	2009-11-25 13:18:46 UTC (rev 4372)
@@ -42,6 +42,7 @@
 
 #include "vtc.h"
 
+#include "vsb.h"
 #include "vqueue.h"
 #include "miniobj.h"
 #include "vss.h"
@@ -78,29 +79,39 @@
 	int fd;
 	int i;
 	unsigned u;
+	struct vsb *vsb;
+	char *p;
 
 	CAST_OBJ_NOTNULL(c, priv, CLIENT_MAGIC);
 	AN(c->connect);
 
+	p = strdup(c->connect);
+	vsb = macro_expand(p);
+	AN(vsb);
+
 	vl = vtc_logopen(c->name);
 
 	if (c->repeat == 0)
 		c->repeat = 1;
 	vtc_log(vl, 2, "Started (%u iterations)", c->repeat);
 	for (u = 0; u < c->repeat; u++) {
-		vtc_log(vl, 3, "Connect to %s", c->connect);
-		fd = VSS_open(c->connect);
+		vtc_log(vl, 3, "Connect to %s", vsb_data(vsb));
+		fd = VSS_open(vsb_data(vsb));
 		for (i = 0; fd < 0 && i < 3; i++) {
 			(void)sleep(1);
-			fd = VSS_open(c->connect);
+			fd = VSS_open(vsb_data(vsb));
 		}
+		if (fd < 0)
+			vtc_log(c->vl, 0, "Failed to open %s", vsb_data(vsb));
 		assert(fd >= 0);
-		vtc_log(vl, 3, "Connected to %s fd is %d", c->connect, fd);
+		vtc_log(vl, 3, "Connected to %s fd is %d", vsb_data(vsb), fd);
 		http_process(vl, c->spec, fd, -1);
 		vtc_log(vl, 3, "Closing fd %d", fd);
 		TCP_close(&fd);
 	}
 	vtc_log(vl, 2, "Ending");
+	vsb_delete(vsb);
+	free(p);
 	return (NULL);
 }
 
@@ -122,7 +133,7 @@
 	if (*c->name != 'c')
 		vtc_log(c->vl, 0, "Client name must start with 'c'");
 
-	REPLACE(c->connect, "127.0.0.1:9081");
+	REPLACE(c->connect, "${v1_sock}");
 	VTAILQ_INSERT_TAIL(&clients, c, list);
 	return (c);
 }

Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-25 13:00:22 UTC (rev 4371)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-11-25 13:18:46 UTC (rev 4372)
@@ -172,7 +172,7 @@
 
 	v->args = vsb_newauto();
 	v->telnet = "127.0.0.1:9001";
-	v->accept = "127.0.0.1:9081";
+	v->accept = "127.0.0.1:0";
 	v->cli_fd = -1;
 	VTAILQ_INSERT_TAIL(&varnishes, v, list);
 



From phk at projects.linpro.no  Fri Nov 27 10:40:13 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 11:40:13 +0100 (CET)
Subject: r4373 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091127104013.473363887A@projects.linpro.no>

Author: phk
Date: 2009-11-27 11:40:13 +0100 (Fri, 27 Nov 2009)
New Revision: 4373

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_http.c
Log:
Make two errormessages slightly different



Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-25 13:18:46 UTC (rev 4372)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-27 10:40:13 UTC (rev 4373)
@@ -337,7 +337,7 @@
 		pfd[0].revents = 0;
 		i = poll(pfd, 1, hp->timeout);
 		if (i <= 0)
-			vtc_log(hp->vl, 0, "HTTP rx failed (%s)",
+			vtc_log(hp->vl, 0, "HTTP rx failed (poll: %s)",
 			    strerror(errno));
 		assert(i > 0);
 		assert(hp->prxbuf + n < hp->nrxbuf);
@@ -345,7 +345,7 @@
 		if (i == 0)
 			return (i);
 		if (i <= 0)
-			vtc_log(hp->vl, 0, "HTTP rx failed (%s)",
+			vtc_log(hp->vl, 0, "HTTP rx failed (read: %s)",
 			    strerror(errno));
 		hp->prxbuf += i;
 		hp->rxbuf[hp->prxbuf] = '\0';



From phk at projects.linpro.no  Fri Nov 27 10:52:30 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 11:52:30 +0100 (CET)
Subject: r4374 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091127105230.91D111F7430@projects.linpro.no>

Author: phk
Date: 2009-11-27 11:52:30 +0100 (Fri, 27 Nov 2009)
New Revision: 4374

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc.c
Log:
Move the macro messages under level4 verbose.

Print out how long the testing took and which test took the longest.



Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-27 10:40:13 UTC (rev 4373)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c	2009-11-27 10:52:30 UTC (rev 4374)
@@ -109,9 +109,9 @@
 		(void)vasprintf(&m->val, fmt, ap);
 		va_end(ap);
 		AN(m->val);
-		vtc_log(vl, 2, "macro def %s=%s", m->name, m->val);
+		vtc_log(vl, 4, "macro def %s=%s", name, m->val);
 	} else if (m != NULL) {
-		vtc_log(vl, 2, "macro undef %s", m->name);
+		vtc_log(vl, 4, "macro undef %s", name);
 		VTAILQ_REMOVE(&macro_list, m, list);
 		free(m->name);
 		free(m->val);
@@ -506,6 +506,8 @@
 	int ch, i, ntest = 1;
 	FILE *fok;
 	static struct vtclog	*vl;
+	double tmax, t0, t00;
+	const char *nmax;
 
 	setbuf(stdout, NULL);
 	setbuf(stderr, NULL);
@@ -536,9 +538,18 @@
 	init_sema();
 
 	vtc_thread = pthread_self();
+	tmax = 0;
+	nmax = NULL;
+	t00 = TIM_mono();
 	for (i = 0; i < ntest; i++) {
 		for (ch = 0; ch < argc; ch++) {
+			t0 = TIM_mono();
 			exec_file(argv[ch], vl);
+			t0 = TIM_mono() - t0;
+			if (t0 > tmax) {
+				tmax = t0;
+				nmax = argv[ch];
+			}
 			if (vtc_error)
 				break;
 		}
@@ -549,6 +560,11 @@
 	if (vtc_error)
 		return (2);
 
+	t00 = TIM_mono() - t00;
+	if (tmax > 0 && nmax != NULL)
+		vtc_log(vl, 1, "Slowest test: %s %.3fs", nmax, tmax);
+	vtc_log(vl, 1, "Total duration: %.3fs", t00);
+
 	fok = fopen("_.ok", "w");
 	if (fok != NULL)
 		AZ(fclose(fok));



From phk at projects.linpro.no  Fri Nov 27 10:53:56 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 11:53:56 +0100 (CET)
Subject: r4375 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091127105356.C52881F7430@projects.linpro.no>

Author: phk
Date: 2009-11-27 11:53:56 +0100 (Fri, 27 Nov 2009)
New Revision: 4375

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/s00001.vtc
Log:
We eliminated death-row, so this test can run much faster now.



Modified: trunk/varnish-cache/bin/varnishtest/tests/s00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/s00001.vtc	2009-11-27 10:52:30 UTC (rev 4374)
+++ trunk/varnish-cache/bin/varnishtest/tests/s00001.vtc	2009-11-27 10:53:56 UTC (rev 4375)
@@ -6,7 +6,7 @@
 	rxreq
 	expect req.url == "/"
 	txresp -hdr "Cache-control: max-age = 1" -body "1111\n"
-	delay 20
+	sema r1 sync 2
 	rxreq
 	expect req.url == "/"
 	txresp -hdr "Cache-control: max-age = 1" -body "22222\n"
@@ -22,7 +22,8 @@
 	expect resp.status == 200
 } -run
 
-delay 20
+sema r1 sync 2
+delay 1.1
 
 client c2 {
 	txreq -url "/"



From phk at projects.linpro.no  Fri Nov 27 11:06:32 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 12:06:32 +0100 (CET)
Subject: r4376 - in trunk/varnish-cache: bin/varnishd bin/varnishtest/tests
	include lib/libvcl
Message-ID: <20091127110632.8B7631F74BC@projects.linpro.no>

Author: phk
Date: 2009-11-27 12:06:32 +0100 (Fri, 27 Nov 2009)
New Revision: 4376

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
   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_param.c
   trunk/varnish-cache/bin/varnishtest/tests/c00007.vtc
   trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc
   trunk/varnish-cache/include/cli.h
   trunk/varnish-cache/include/purge_vars.h
   trunk/varnish-cache/include/vcl.h
   trunk/varnish-cache/include/vrt_obj.h
   trunk/varnish-cache/lib/libvcl/vcc_action.c
   trunk/varnish-cache/lib/libvcl/vcc_compile.c
   trunk/varnish-cache/lib/libvcl/vcc_compile.h
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
   trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Eliminate the obj.hash hack.

This was originally a quick hack to allow purging to take the Host:
header into account.

We have a much better and precisely expressive purge syntax now, so
this hack can die.



Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -423,12 +423,6 @@
 	struct acct		acct;
 	struct acct		acct_req;
 
-	/* pointers to hash string components */
-	unsigned		nhashptr;
-	unsigned		ihashptr;
-	unsigned		lhashptr;
-	const char		**hashptr;
-
 #if defined(HAVE_EPOLL_CTL)
 	struct epoll_event ev;
 #endif

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -160,18 +160,6 @@
 }
 
 static int
-ban_cond_hash(const struct ban_test *bt, const struct object *o,
-   const struct sess *sp)
-{
-	(void)sp;
-	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(o->objcore, OBJCORE_MAGIC);
-	CHECK_OBJ_NOTNULL(o->objcore->objhead, OBJHEAD_MAGIC);
-	AN(o->objcore->objhead->hash);
-	return(ban_cond_str(bt, o->objcore->objhead->hash));
-}
-
-static int
 ban_cond_req_http(const struct ban_test *bt, const struct object *o,
    const struct sess *sp)
 {
@@ -759,24 +747,12 @@
 static void
 ccf_purge_hash(struct cli *cli, const char * const *av, void *priv)
 {
-	const char *aav[6];
 
+	(void)av;
 	(void)priv;
-	if (!save_hash) {
-		cli_out(cli,
-		    "purge.hash not possible.\n"
-		    "Set the \"purge_hash\" parameter to on\n"
-		    "and restart the varnish worker process to enable.\n");
-		cli_result(cli, CLIS_CANT);
-		return;
-	}
-	aav[0] = NULL;
-	aav[1] = "purge";
-	aav[2] = "obj.hash";
-	aav[3] = "~";
-	aav[4] = av[2];
-	aav[5] = NULL;
-	ccf_purge(cli, aav, priv);
+	cli_out(cli, "purge.hash is no longer supported.\n");
+	cli_result(cli, CLIS_CANT);
+	return;
 }
 
 static void
@@ -819,10 +795,10 @@
 	 * XXX: COMPAT: to stay compatible with 1.x series syntax.
 	 */
 	{ CLI_HIDDEN("url.purge", 1, 1)		ccf_purge_url },
-	{ CLI_HIDDEN("hash.purge", 1, 1)	ccf_purge_hash },
+	{ CLI_HIDDEN("hash.purge", 0, 1)	ccf_purge_hash },
+	{ CLI_HIDDEN("purge.hash", 0, 1)	ccf_purge_hash },
 
 	{ CLI_PURGE_URL,			ccf_purge_url },
-	{ CLI_PURGE_HASH,			ccf_purge_hash },
 	{ CLI_PURGE,				ccf_purge },
 	{ CLI_PURGE_LIST,			ccf_purge_list },
 	{ NULL }

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -776,7 +776,7 @@
 	CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
 
 	if (sp->obj == NULL) {
-		HSH_BeforeVclHash(sp, sp->vcl->nhashcount);
+		HSH_BeforeVclHash(sp);
 		VCL_hash_method(sp);
 		assert(sp->handling == VCL_RET_HASH);
 		HSH_AfterVclHash(sp);

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -71,7 +71,6 @@
 #include "cache_backend.h"
 
 static const struct hash_slinger *hash;
-unsigned	save_hash;
 
 double
 HSH_Grace(double g)
@@ -157,7 +156,6 @@
 	assert(VTAILQ_EMPTY(&oh->objcs));
 	Lck_Delete(&oh->mtx);
 	w->stats.n_objecthead--;
-	free(oh->hash);
 	FREE_OBJ(oh);
 }
 
@@ -174,51 +172,10 @@
 }
 
 void
-HSH_Copy(const struct sess *sp, struct objhead *oh)
+HSH_BeforeVclHash(const struct sess *sp)
 {
-	unsigned u, v;
-	char *b;
 
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
-	if (!save_hash)
-		return;
-
-	oh->hash = malloc(sp->lhashptr);
-	XXXAN(oh->hash);
-	b = oh->hash;
-	for (u = 0; u < sp->ihashptr; u += 2) {
-		v = pdiff(sp->hashptr[u], sp->hashptr[u + 1]);
-		memcpy(b, sp->hashptr[u], v);
-		b += v;
-		*b++ = '#';
-	}
-	*b++ = '\0';
-	assert(b <= oh->hash + sp->lhashptr);
-}
-
-void
-HSH_BeforeVclHash(struct sess *sp, unsigned nhashcount)
-{
-	char *p;
-	unsigned u;
-
 	SHA256_Init(sp->wrk->sha256ctx);
-	if (!save_hash)
-		return;
-
-	/* Allocate the pointers we need, align properly. */
-	sp->lhashptr = 1;       /* space for NUL */
-	sp->ihashptr = 0;
-	sp->nhashptr = nhashcount * 2;
-	p = WS_Alloc(sp->http->ws, sizeof(const char *) * (sp->nhashptr + 1L));
-	XXXAN(p);
-	/* Align pointer properly (?) */
-	u = (uintptr_t)p;
-	u &= sizeof(const char *) - 1;
-	if (u)
-		p += sizeof(const char *) - u;
-	sp->hashptr = (void*)p;
 }
 
 void
@@ -230,7 +187,7 @@
 }
 
 void
-HSH_AddString(struct sess *sp, const char *str)
+HSH_AddString(const struct sess *sp, const char *str)
 {
 	int l;
 
@@ -243,21 +200,6 @@
 
 	if (params->log_hash)
 		WSP(sp, SLT_Hash, "%s", str);
-
-	if (!save_hash)
-		return;
-
-	/*
-	* XXX: handle this by bouncing sp->vcl->nhashcount when it fails
-	* XXX: and dispose of this request either by reallocating the
-	* XXX: hashptr (if possible) or restarting/error the request
-	*/
-	xxxassert(sp->ihashptr < sp->nhashptr);
-
-	sp->hashptr[sp->ihashptr] = str;
-	sp->hashptr[sp->ihashptr + 1] = str + l;
-	sp->ihashptr += 2;
-	sp->lhashptr += l + 1;
 }
 
 /**********************************************************************
@@ -495,7 +437,7 @@
 			VTAILQ_INSERT_TAIL(&oh->waitinglist, sp, list);
 		if (params->diag_bitmap & 0x20)
 			WSP(sp, SLT_Debug,
-				"on waiting list <%s>", oh->hash);
+				"on waiting list <%p>", oh);
 		SES_Charge(sp);
 		sp->objhead = oh;
 		sp->wrk = NULL;
@@ -734,7 +676,6 @@
 {
 
 	assert(DIGEST_LEN == SHA256_LEN);	/* avoid #include pollution */
-	save_hash = params->save_hash;
 	hash = heritage.hash;
 	if (hash->start != NULL)
 		hash->start();

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -777,21 +777,6 @@
 	return (TIM_real() - sp->obj->last_use);
 }
 
-const char *
-VRT_r_obj_hash(const struct sess *sp)
-{
-
-	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	if (sp->obj == NULL)
-		return (NULL);
-	CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
-	if (sp->obj->objcore == NULL)
-		return (NULL);
-	CHECK_OBJ_NOTNULL(sp->obj->objcore, OBJCORE_MAGIC);
-	CHECK_OBJ_NOTNULL(sp->obj->objcore->objhead, OBJHEAD_MAGIC);
-	return (sp->obj->objcore->objhead->hash);
-}
-
 unsigned
 VRT_r_req_backend_healthy(const struct sess *sp)
 {

Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -150,8 +150,6 @@
 
 	noh->hoh_head = hp;
 
-	HSH_Copy(sp, noh);
-
 	Lck_Unlock(&hp->mtx);
 	return (noh);
 }

Modified: trunk/varnish-cache/bin/varnishd/hash_critbit.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -297,10 +297,9 @@
 		return;
 	if (hcb_is_node(p)) {
 		oh = hcb_l_node(p);
-		cli_out(cli, "%*.*sN %d r%u <%02x%02x%02x...> <%s>\n",
+		cli_out(cli, "%*.*sN %d r%u <%02x%02x%02x...>\n",
 		    indent, indent, "", indent / 2, oh->refcnt,
-		    oh->digest[0], oh->digest[1], oh->digest[2],
-		    oh->hash);
+		    oh->digest[0], oh->digest[1], oh->digest[2]);
 		return;
 	}
 	assert(hcb_is_y(p));
@@ -424,6 +423,7 @@
 	struct objhead *oh;
 	unsigned u;
 
+	(void)sp;
 	oh =  hcb_insert(&hcb_root, noh, 0);
 	if (oh != NULL) {
 		/* Assert that we didn't muck with the tree without lock */
@@ -447,7 +447,6 @@
 	 * Try again, holding lock and fully ready objhead, so that if
 	 * somebody else beats us back, they do not get surprised.
 	 */
-	HSH_Copy(sp, noh);
 	Lck_Lock(&hcb_mtx);
 	assert(noh->refcnt == 1);
 	oh =  hcb_insert(&hcb_root, noh, 1);
@@ -458,8 +457,6 @@
 #endif
 	} else {
 		CHECK_OBJ_NOTNULL(noh, OBJHEAD_MAGIC);
-		free(noh->hash);
-		noh->hash = NULL;
 		VSL_stats->hcb_lock++;
 #ifdef PHK
 		fprintf(stderr, "hcb_lookup %d\n", __LINE__);

Modified: trunk/varnish-cache/bin/varnishd/hash_simple_list.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_simple_list.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/hash_simple_list.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -91,8 +91,6 @@
 	else
 		VTAILQ_INSERT_TAIL(&hsl_head, noh, hoh_list);
 
-	HSH_Copy(sp, noh);
-
 	Lck_Unlock(&hsl_mtx);
 	return (noh);
 }

Modified: trunk/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -54,15 +54,14 @@
 void HSH_Prealloc(const struct sess *sp);
 void HSH_Cleanup(struct worker *w);
 void HSH_Freestore(struct object *o);
-void HSH_Copy(const struct sess *sp, struct objhead *o);
 struct objcore *HSH_Lookup(struct sess *sp, struct objhead **poh);
 void HSH_Unbusy(const struct sess *sp);
 void HSH_Ref(struct object *o);
 void HSH_Drop(struct sess *sp);
 double HSH_Grace(double g);
 void HSH_Init(void);
-void HSH_AddString(struct sess *sp, const char *str);
-void HSH_BeforeVclHash(struct sess *sp, unsigned hashcount);
+void HSH_AddString(const struct sess *sp, const char *str);
+void HSH_BeforeVclHash(const struct sess *sp);
 void HSH_AfterVclHash(const struct sess *sp);
 void HSH_DerefObjCore(struct sess *sp);
 void HSH_FindBan(struct sess *sp, struct objcore **oc);
@@ -79,7 +78,6 @@
 	struct lock		mtx;
 	unsigned		refcnt;
 	VTAILQ_HEAD(,objcore)	objcs;
-	char			*hash;
 	unsigned char		digest[DIGEST_LEN];
 	union {
 		VTAILQ_HEAD(, sess)	__u_waitinglist;
@@ -103,7 +101,6 @@
 #define hoh_head u.n.u_n_hoh_head
 };
 
-extern unsigned	save_hash;
 void HSH_DeleteObjHead(struct worker *w, struct objhead *oh);
 void HSH_Deref(struct worker *w, struct object **o);
 #endif /* VARNISH_CACHE_CHILD */

Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -176,9 +176,6 @@
 	/* Log hash string to shm */
 	unsigned		log_hash;
 
-	/* Log hash string to shm */
-	unsigned		save_hash;
-
 	/* Log local socket address to shm */
 	unsigned		log_local_addr;
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -712,12 +712,6 @@
 		"Log the hash string to shared memory log.\n",
 		0,
 		"off", "bool" },
-	{ "purge_hash", tweak_bool, &master.save_hash, 0, 0,
-		"Enable purge.hash command.\n"
-		"NB: this increases storage requirement per object "
-		"by the length of the hash string.\n",
-		MUST_RESTART,
-		"off", "bool" },
 	{ "log_local_address", tweak_bool, &master.log_local_addr, 0, 0,
 		"Log the local address on the TCP connection in the "
 		"SessionOpen shared memory record.\n",

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00007.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00007.vtc	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00007.vtc	2009-11-27 11:06:32 UTC (rev 4376)
@@ -2,37 +2,4 @@
 
 test "Test banning a hash"
 
-server s1 {
-	rxreq
-	expect req.url == "/foo"
-	txresp -body "1111\n"
-	rxreq
-	expect req.url == "/foo"
-	txresp -body "11111\n"
-} -start
-
-varnish v1 -arg "-ppurge_hash=off" -vcl+backend { } -start
-varnish v1 -clierr 300 "purge.hash foo"
-varnish v1 -stop
-varnish v1 -cliok "param.set purge_hash on"
-varnish v1 -start
-
-client c1 {
-	txreq -url "/foo"
-	rxresp
-	expect resp.status == 200
-	expect resp.http.content-length == 5
-} 
-
-client c1 -run
-
-varnish v1 -cliok "purge.hash foo"
-
-client c1 {
-	txreq -url "/foo"
-	rxresp
-	expect resp.status == 200
-	expect resp.http.content-length == 6
-}
-
-client c1 -run
+varnish v1 -arg "-b 127.0.0.1:80 -a 127.0.0.1:0" -start -clierr 300 "purge.hash foo"

Modified: trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc	2009-11-27 11:06:32 UTC (rev 4376)
@@ -13,7 +13,7 @@
 	txresp -hdr "foo: 3" -body "foo3"
 } -start
 
-varnish v1 -arg "-p purge_hash=on" -vcl+backend {} -start
+varnish v1 -vcl+backend {} -start
 
 varnish v1 -cliok "purge.url FOO"
 
@@ -61,8 +61,8 @@
 } -run
 
 
-# Now add another two purge, the hash should not be hit.
-varnish v1 -cliok "purge.hash FOO"
+# Now add another two purges, Kilroy should not be hit
+varnish v1 -cliok "purge.url KILROY"
 varnish v1 -cliok "purge.url FOO"
 varnish v1 -expect n_purge_add == 5
 

Modified: trunk/varnish-cache/include/cli.h
===================================================================
--- trunk/varnish-cache/include/cli.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/include/cli.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -67,13 +67,6 @@
 	    "marked obsolete.",						\
 	1, 1
 
-#define CLI_PURGE_HASH							\
-	"purge.hash",							\
-	"purge.hash <regexp>",						\
-	"\tAll objects where the hash string matches regexp will be "	\
-	    "marked obsolete.",						\
-	1, 1
-
 #define CLI_PURGE							\
 	"purge",							\
 	"purge <field> <operator> <arg> [&& <field> <oper> <arg>]...",	\

Modified: trunk/varnish-cache/include/purge_vars.h
===================================================================
--- trunk/varnish-cache/include/purge_vars.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/include/purge_vars.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -35,6 +35,5 @@
 #define PVAR_REQ	2
 
 PVAR("req.url",		PVAR_REQ,		ban_cond_url)
-PVAR("obj.hash",	0,			ban_cond_hash)
 PVAR("req.http.",	PVAR_REQ|PVAR_HTTP,	ban_cond_req_http)
 PVAR("obj.http.",	PVAR_HTTP,		ban_cond_obj_http)

Modified: trunk/varnish-cache/include/vcl.h
===================================================================
--- trunk/varnish-cache/include/vcl.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/include/vcl.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -53,8 +53,6 @@
 	const char	**srcname;
 	const char	**srcbody;
 
-	unsigned	nhashcount;
-
 	vcl_init_f	*init_func;
 	vcl_fini_f	*fini_func;
 

Modified: trunk/varnish-cache/include/vrt_obj.h
===================================================================
--- trunk/varnish-cache/include/vrt_obj.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/include/vrt_obj.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -66,7 +66,6 @@
 double VRT_r_obj_grace(const struct sess *);
 void VRT_l_obj_grace(const struct sess *, double);
 double VRT_r_obj_lastuse(const struct sess *);
-const char * VRT_r_obj_hash(const struct sess *);
 const char * VRT_r_resp_proto(const struct sess *);
 void VRT_l_resp_proto(const struct sess *, const char *, ...);
 int VRT_r_resp_status(const struct sess *);

Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -269,7 +269,6 @@
 		 * variable, so that varnishd can preallocate the worst case
 		 * number of slots for composing the hash string.
 		 */
-		tl->nhashcount++;
 		break;
 	case STRING:
 		if (tl->t->tok != '=') {

Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -357,7 +357,6 @@
 	Fc(tl, 0, "\t.nsrc = %u,\n", tl->nsources);
 	Fc(tl, 0, "\t.srcname = srcname,\n");
 	Fc(tl, 0, "\t.srcbody = srcbody,\n");
-	Fc(tl, 0, "\t.nhashcount = %u,\n", tl->nhashcount);
 #define VCL_MET_MAC(l,u,b) \
 	Fc(tl, 0, "\t." #l "_func = VGC_function_vcl_" #l ",\n");
 #include "vcl_returns.h"

Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.h
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.h	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.h	2009-11-27 11:06:32 UTC (rev 4376)
@@ -90,7 +90,6 @@
 	VTAILQ_HEAD(, acl_e)	acl;
 
 	unsigned		recnt;
-	unsigned		nhashcount;
 	unsigned		nsockaddr;
 };
 

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -1,5 +1,5 @@
 /*
- * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08:47:03Z phk $
+ * $Id: vcc_gen_fixed_token.tcl 4358 2009-11-19 19:03:25Z phk $
  *
  * NB:  This file is machine generated, DO NOT EDIT!
  *
@@ -159,8 +159,8 @@
 
 	/* ../../include/vcl.h */
 
-	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08");
-	vsb_cat(sb, ":47:03Z phk $\n *\n * NB:  This file is machine genera");
+	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4358 2009-11-19 19");
+	vsb_cat(sb, ":03:25Z phk $\n *\n * NB:  This file is machine genera");
 	vsb_cat(sb, "ted, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_t");
 	vsb_cat(sb, "oken.tcl instead\n */\n\nstruct sess;\n");
 	vsb_cat(sb, "struct cli;\n\ntypedef void vcl_init_f(struct cli *);\n");
@@ -188,14 +188,13 @@
 	vsb_cat(sb, "\tunsigned\tnref;\n\tunsigned\tbusy;\n");
 	vsb_cat(sb, "\tunsigned\tdiscard;\n\n\tunsigned\tnsrc;\n");
 	vsb_cat(sb, "\tconst char\t**srcname;\n\tconst char\t**srcbody;\n");
-	vsb_cat(sb, "\n\tunsigned\tnhashcount;\n\n\tvcl_init_f\t*init_func;");
-	vsb_cat(sb, "\n\tvcl_fini_f\t*fini_func;\n\n");
-	vsb_cat(sb, "\tvcl_func_f\t*recv_func;\n\tvcl_func_f\t*pipe_func;\n");
-	vsb_cat(sb, "\tvcl_func_f\t*pass_func;\n\tvcl_func_f\t*hash_func;\n");
-	vsb_cat(sb, "\tvcl_func_f\t*miss_func;\n\tvcl_func_f\t*hit_func;\n");
-	vsb_cat(sb, "\tvcl_func_f\t*fetch_func;\n\tvcl_func_f\t*deliver_fun");
-	vsb_cat(sb, "c;\n\tvcl_func_f\t*error_func;\n");
-	vsb_cat(sb, "};\n");
+	vsb_cat(sb, "\n\tvcl_init_f\t*init_func;\n\tvcl_fini_f\t*fini_func;");
+	vsb_cat(sb, "\n\n\tvcl_func_f\t*recv_func;\n");
+	vsb_cat(sb, "\tvcl_func_f\t*pipe_func;\n\tvcl_func_f\t*pass_func;\n");
+	vsb_cat(sb, "\tvcl_func_f\t*hash_func;\n\tvcl_func_f\t*miss_func;\n");
+	vsb_cat(sb, "\tvcl_func_f\t*hit_func;\n\tvcl_func_f\t*fetch_func;\n");
+	vsb_cat(sb, "\tvcl_func_f\t*deliver_func;\n\tvcl_func_f\t*error_fun");
+	vsb_cat(sb, "c;\n};\n");
 
 	/* ../../include/vrt.h */
 
@@ -319,8 +318,8 @@
 
 	/* ../../include/vrt_obj.h */
 
-	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08");
-	vsb_cat(sb, ":47:03Z phk $\n *\n * NB:  This file is machine genera");
+	vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4358 2009-11-19 19");
+	vsb_cat(sb, ":03:25Z phk $\n *\n * NB:  This file is machine genera");
 	vsb_cat(sb, "ted, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_t");
 	vsb_cat(sb, "oken.tcl instead\n */\n\nstruct sockaddr * VRT_r_clien");
 	vsb_cat(sb, "t_ip(const struct sess *);\nstruct sockaddr * VRT_r_se");
@@ -384,7 +383,6 @@
 	vsb_cat(sb, "double VRT_r_obj_grace(const struct sess *);\n");
 	vsb_cat(sb, "void VRT_l_obj_grace(const struct sess *, double);\n");
 	vsb_cat(sb, "double VRT_r_obj_lastuse(const struct sess *);\n");
-	vsb_cat(sb, "const char * VRT_r_obj_hash(const struct sess *);\n");
 	vsb_cat(sb, "const char * VRT_r_resp_proto(const struct sess *);\n");
 	vsb_cat(sb, "void VRT_l_resp_proto(const struct sess *, const char ");
 	vsb_cat(sb, "*, ...);\nint VRT_r_resp_status(const struct sess *);\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2009-11-27 11:06:32 UTC (rev 4376)
@@ -303,11 +303,6 @@
 	{ hit deliver error }
 	"const struct sess *"
     }
-    { obj.hash				STRING
-	RO
-	{ miss hit deliver error }
-	"const struct sess *"
-    }
 
     #######################################################################
     # The response we send back
@@ -584,8 +579,6 @@
 	const char	**srcname;
 	const char	**srcbody;
 
-	unsigned	nhashcount;
-
 	vcl_init_f	*init_func;
 	vcl_fini_f	*fini_func;
 }

Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-27 10:53:56 UTC (rev 4375)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c	2009-11-27 11:06:32 UTC (rev 4376)
@@ -1,5 +1,5 @@
 /*
- * $Id: vcc_gen_fixed_token.tcl 4236 2009-09-14 08:47:03Z phk $
+ * $Id: vcc_gen_fixed_token.tcl 4358 2009-11-19 19:03:25Z phk $
  *
  * NB:  This file is machine generated, DO NOT EDIT!
  *
@@ -279,12 +279,6 @@
 	    V_RO,	    0,
 	    VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
 	},
-	{ "obj.hash", STRING, 8,
-	    "VRT_r_obj_hash(sp)",
-	    NULL,
-	    V_RO,	    0,
-	    VCL_MET_MISS | VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
-	},
 	{ "resp.proto", STRING, 10,
 	    "VRT_r_resp_proto(sp)",
 	    "VRT_l_resp_proto(sp, ",



From phk at projects.linpro.no  Fri Nov 27 11:53:50 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 12:53:50 +0100 (CET)
Subject: r4377 - trunk/varnish-cache/bin/varnishtest
Message-ID: <20091127115350.455BF1F74F7@projects.linpro.no>

Author: phk
Date: 2009-11-27 12:53:50 +0100 (Fri, 27 Nov 2009)
New Revision: 4377

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc.h
   trunk/varnish-cache/bin/varnishtest/vtc_http.c
Log:
White-space nits



Modified: trunk/varnish-cache/bin/varnishtest/vtc.h
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-27 11:06:32 UTC (rev 4376)
+++ trunk/varnish-cache/bin/varnishtest/vtc.h	2009-11-27 11:53:50 UTC (rev 4377)
@@ -73,5 +73,6 @@
 void vtc_dump(struct vtclog *vl, unsigned lvl, const char *pfx,
     const char *str);
 
-void macro_def(struct vtclog *vl, const char *instance, const char *name, const char *fmt, ...);
+void macro_def(struct vtclog *vl, const char *instance, const char *name,
+    const char *fmt, ...);
 struct vsb *macro_expand(char *name);

Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-27 11:06:32 UTC (rev 4376)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c	2009-11-27 11:53:50 UTC (rev 4377)
@@ -85,8 +85,8 @@
 			vtc_log(hp->vl, 0,				\
 			    "\"%s\" only possible in server", av[0]);	\
 	} while (0)
-			    
 
+
 /* XXX: we may want to vary this */
 static const char * const nl = "\r\n";
 
@@ -138,7 +138,7 @@
 	AZ(vsb_overflowed(hp->vsb));
 	vtc_dump(hp->vl, lvl, pfx, vsb_data(hp->vsb));
 	l = write(hp->fd, vsb_data(hp->vsb), vsb_len(hp->vsb));
-	if (l != vsb_len(hp->vsb)) 
+	if (l != vsb_len(hp->vsb))
 		vtc_log(hp->vl, 0, "Write failed: %s", strerror(errno));
 }
 



From phk at projects.linpro.no  Fri Nov 27 20:22:23 2009
From: phk at projects.linpro.no (phk at projects.linpro.no)
Date: Fri, 27 Nov 2009 21:22:23 +0100 (CET)
Subject: r4378 - trunk/varnish-cache/bin/varnishtest/tests
Message-ID: <20091127202223.C3A9F1F750F@projects.linpro.no>

Author: phk
Date: 2009-11-27 21:22:23 +0100 (Fri, 27 Nov 2009)
New Revision: 4378

Added:
   trunk/varnish-cache/bin/varnishtest/tests/v00025.vtc
Log:
Add more coverage tests of cache_vrt.c



Added: trunk/varnish-cache/bin/varnishtest/tests/v00025.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00025.vtc	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00025.vtc	2009-11-27 20:22:23 UTC (rev 4378)
@@ -0,0 +1,63 @@
+# $Id$
+
+test "More VCL coverage"
+
+server s1 {
+	rxreq
+	txresp
+} -start
+
+varnish v1 -vcl+backend {
+
+sub vcl_deliver {
+	if (obj.lastuse > 3 s) {
+		set resp.http.lastuse = "then";
+	} else {
+		set resp.http.lastuse = "now";
+	}
+	set resp.http.server_port = server.port;
+}
+
+sub vcl_fetch {
+	if (req.esi) {
+		set beresp.http.esi = "yes";
+	}
+	set beresp.http.backend = req.backend;
+	if (beresp.ttl > 3 s) {
+		set beresp.http.ttl = "long";
+	} else {
+		set beresp.http.ttl = "short";
+	}
+}
+
+sub vcl_hit {
+	if (obj.grace < 3m) {
+		set obj.grace = 1m;
+	} else {
+		set obj.grace = 2m;
+	}
+	if (obj.ttl < 3m) {
+		set obj.ttl = 2m;
+	} else {
+		set obj.ttl = 3m;
+	}
+}
+
+sub vcl_miss {
+	if (bereq.between_bytes_timeout < 10s) {
+		set bereq.http.quick = "please";
+	}
+	if (bereq.connect_timeout < 10s) {
+		set bereq.http.hello = "please";
+	}
+	set bereq.connect_timeout = 10s;
+}
+
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	txreq
+	rxresp
+} -run