r1929 - in branches/1.1: . bin/varnishd debian etc man redhat

[des at projects.linpro.no]

Author: des
Date: 2007-08-29 17:37:59 +0200 (Wed, 29 Aug 2007)
New Revision: 1929

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_center.c
   branches/1.1/bin/varnishd/mgt_vcc.c
   branches/1.1/debian/Makefile.am
   branches/1.1/etc/default.vcl
   branches/1.1/man/vcl.7
   branches/1.1/redhat/Makefile.am
Log:
Merged revisions 1913-1916,1920-1928 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1913 | phk | 2007-08-21 11:23:31 +0200 (Tue, 21 Aug 2007) | 9 lines
  
  Make sure wrk->used is always set when we park on an object, we might be
  unlucky multiple times in which case the responsibility falls back to
  cnt_lookup().
  
  Fixes 144.
........
  r1915 | des | 2007-08-21 17:36:59 +0200 (Tue, 21 Aug 2007) | 2 lines
  
  Try to make this comment a little more visible.
........
  r1916 | des | 2007-08-21 17:37:17 +0200 (Tue, 21 Aug 2007) | 2 lines
  
  Synchronize with bin/varnishd/mgt_vcc.c.
........
  r1925 | des | 2007-08-29 17:21:59 +0200 (Wed, 29 Aug 2007) | 2 lines
  
  Improve readability.
........
  r1926 | des | 2007-08-29 17:23:52 +0200 (Wed, 29 Aug 2007) | 1 line
  
  Tabify
........
  r1927 | des | 2007-08-29 17:24:42 +0200 (Wed, 29 Aug 2007) | 2 lines
  
  Add missing files.
........
  r1928 | des | 2007-08-29 17:25:58 +0200 (Wed, 29 Aug 2007) | 2 lines
  
  Readability
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907,1909
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907,1909,1913-1916,1920-1928

Modified: branches/1.1/bin/varnishd/cache_center.c
===================================================================
--- branches/1.1/bin/varnishd/cache_center.c	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/bin/varnishd/cache_center.c	2007-08-29 15:37:59 UTC (rev 1929)
@@ -488,7 +488,12 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
-		assert(!isnan(sp->wrk->used));
+		/*
+		 * There is a non-zero risk that we come here more than once
+		 * before we get through, in that case cnt_recv must be set
+		 */
+		if (isnan(sp->wrk->used))
+			sp->wrk->used = TIM_real();
 		SES_Charge(sp);
 		return (1);
 	}

Modified: branches/1.1/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_vcc.c	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/bin/varnishd/mgt_vcc.c	2007-08-29 15:37:59 UTC (rev 1929)
@@ -67,7 +67,9 @@
 
 /*--------------------------------------------------------------------*/
 
-/* keep this in synch with man/vcl.7 */
+/*
+ * Keep this in synch with man/vcl.7 and etc/default.vcl!
+ */
 static const char *default_vcl =
     "sub vcl_recv {\n"
     "    if (req.request != \"GET\" && req.request != \"HEAD\") {\n"

Modified: branches/1.1/debian/Makefile.am
===================================================================
--- branches/1.1/debian/Makefile.am	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/debian/Makefile.am	2007-08-29 15:37:59 UTC (rev 1929)
@@ -1,7 +1,28 @@
 # $Id$
 
-EXTRA_DIST =								\
-	changelog compat control copyright dirs docs lintian-override	\
-	README.Debian rules TODO varnish.default varnish.examples	\
-	varnish.init varnish.logrotate varnish.postrm			\
-	varnish.varnishlog.init
+EXTRA_DIST =			\
+	README.Debian		\
+	TODO			\
+	changelog		\
+	compat			\
+	control			\
+	copyright		\
+	dirs			\
+	docs			\
+	libvarnish-dev.dirs	\
+	libvarnish-dev.install	\
+	libvarnish.dirs		\
+	libvarnish.install	\
+	lintian-override	\
+	rules			\
+	varnish.default		\
+	varnish.dirs		\
+	varnish.examples	\
+	varnish.init		\
+	varnish.install		\
+	varnish.logrotate	\
+	varnish.manpages	\
+	varnish.postinst	\
+	varnish.postrm		\
+	varnish.varnishlog.init \
+	watch

Modified: branches/1.1/etc/default.vcl
===================================================================
--- branches/1.1/etc/default.vcl	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/etc/default.vcl	2007-08-29 15:37:59 UTC (rev 1929)
@@ -47,6 +47,8 @@
 ## Called when entering an object into the cache
 #
 #sub vcl_hash {
+#	set req.hash += req.url;
+#	set req.hash += req.http.host;
 #	hash;
 #}
 #

Modified: branches/1.1/man/vcl.7
===================================================================
--- branches/1.1/man/vcl.7	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/man/vcl.7	2007-08-29 15:37:59 UTC (rev 1929)
@@ -510,6 +510,8 @@
 }
 
 sub vcl_hash {
+    set req.hash += req.url;
+    set req.hash += req.http.host;
     hash;
 }
 

Modified: branches/1.1/redhat/Makefile.am
===================================================================
--- branches/1.1/redhat/Makefile.am	2007-08-29 15:25:58 UTC (rev 1928)
+++ branches/1.1/redhat/Makefile.am	2007-08-29 15:37:59 UTC (rev 1929)
@@ -1,5 +1,10 @@
 # $Id$
 
-EXTRA_DIST =								\
-	README.redhat TODO varnish.initrc varnishlog.initrc		\
-	varnish.logrotate varnish.spec varnish.sysconfig
+EXTRA_DIST =			\
+	README.redhat		\
+	TODO			\
+	varnish.initrc		\
+	varnish.logrotate	\
+	varnish.spec		\
+	varnish.sysconfig	\
+	varnishlog.initrc