r4673 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-04-19 12:41:52 +0200 (Mon, 19 Apr 2010)
New Revision: 4673

Modified:
   branches/2.1/
   branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
   branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
   branches/2.1/varnish-cache/bin/varnishd/vparam.h
   branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/e00003.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
   branches/2.1/varnish-cache/include/vct.h
   branches/2.1/varnish-cache/include/vev.h
   branches/2.1/varnish-cache/lib/libvarnish/tcp.c
   branches/2.1/varnish-cache/lib/libvarnish/vev.c
   branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
Log:
Merge r4644: Add another client cycle, to make sure there is no difference between miss/hit ESI processing




Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:4637,4640,4643
   + /trunk:4637,4640,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643
   + /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643
   + /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643
   + /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643
   + /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4644

Modified: branches/2.1/varnish-cache/bin/varnishtest/tests/e00003.vtc
===================================================================
--- branches/2.1/varnish-cache/bin/varnishtest/tests/e00003.vtc	2010-04-19 10:26:23 UTC (rev 4672)
+++ branches/2.1/varnish-cache/bin/varnishtest/tests/e00003.vtc	2010-04-19 10:41:52 UTC (rev 4673)
@@ -29,6 +29,11 @@
 	rxresp
 	expect resp.bodylen == 65
 	expect resp.status == 200
+	# test that there is no difference on miss/hit
+	txreq 
+	rxresp
+	expect resp.bodylen == 65
+	expect resp.status == 200
 }
 
 client c1 -run


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643
   + /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643
   + /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643
   + /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/include/vct.h:4637,4643
   + /trunk/varnish-cache/include/vct.h:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/include/vev.h:4637,4643
   + /trunk/varnish-cache/include/vev.h:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643
   + /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643
   + /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4644


Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643
   + /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4644