[experimental-ims] ff52bbd Merge conditional backend requests with current trunk

[Geoff Simmons]

commit ff52bbd5888533f4255c57681608b6b3aab08100
Author: Geoff Simmons <geoff at uplex.de>
Date:   Tue Jun 7 06:59:57 2011 +0200

    Merge conditional backend requests with current trunk

diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 8515c5e..d80dd74 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -701,6 +701,7 @@ void EXP_Set_keep(struct exp *e, double v);
 
 double EXP_Ttl(const struct sess *, const struct object*);
 double EXP_Grace(const struct sess *, const struct object*);
+double EXP_Keep(const struct sess *, const struct object*);
 void EXP_Insert(struct object *o);
 void EXP_Inject(struct objcore *oc, struct lru *lru, double when);
 void EXP_Init(void);
diff --git a/bin/varnishd/cache_expire.c b/bin/varnishd/cache_expire.c
index c0e79cc..5fc944a 100644
--- a/bin/varnishd/cache_expire.c
+++ b/bin/varnishd/cache_expire.c
@@ -97,7 +97,7 @@ EXP_ACCESS(keep, 0.,)
  * by per-session limits.
  */
 
-static double
+double
 EXP_Keep(const struct sess *sp, const struct object *o)
 {
 	double r;
diff --git a/bin/varnishd/cache_http.c b/bin/varnishd/cache_http.c
index f0e1756..0f1491e 100644
--- a/bin/varnishd/cache_http.c
+++ b/bin/varnishd/cache_http.c
@@ -66,11 +66,10 @@ static const enum VSL_tag_e logmtx[][HTTP_HDR_FIRST + 1] = {
 };
 /*lint -restore */
 
-static enum VSL_tag_e
-
 void http_FilterMissingFields(struct worker *w, int fd, struct http *to,
     const struct http *fm);
 
+static enum VSL_tag_e
 http2shmlog(const struct http *hp, int t)
 {
 
diff --git a/bin/varnishtest/tests/i00000.vtc b/bin/varnishtest/tests/i00000.vtc
index 773e1e5..4c4aeb5 100644
--- a/bin/varnishtest/tests/i00000.vtc
+++ b/bin/varnishtest/tests/i00000.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "VCL compiler coverage test: conditional refresh extension"
+varnishtest "VCL compiler coverage test: conditional refresh extension"
 
 ## stale_obj is r/o in miss, fetch and error, illegal everywhere else
 
diff --git a/bin/varnishtest/tests/i00001.vtc b/bin/varnishtest/tests/i00001.vtc
index 488305f..306cc57 100644
--- a/bin/varnishtest/tests/i00001.vtc
+++ b/bin/varnishtest/tests/i00001.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Test basic conditional requests to backends"
+varnishtest "Test basic conditional requests to backends"
 
 ## By default (default_keep = default_grace), cond. requests happen during grace
 
diff --git a/bin/varnishtest/tests/i00002.vtc b/bin/varnishtest/tests/i00002.vtc
index 3725532..adae568 100644
--- a/bin/varnishtest/tests/i00002.vtc
+++ b/bin/varnishtest/tests/i00002.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "handling stale_obj in vcl_miss() and vcl_fetch()"
+varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00003.vtc b/bin/varnishtest/tests/i00003.vtc
index 809b317..293e843 100644
--- a/bin/varnishtest/tests/i00003.vtc
+++ b/bin/varnishtest/tests/i00003.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Test some anticipated use cases for conditional backend requests"
+varnishtest "Test some anticipated use cases for conditional backend requests"
 
 ## In vcl_miss(), it is possible to veto a conditional request by removing any
 ## If-Modified-Since or If-None-Match header.
diff --git a/bin/varnishtest/tests/i00004.vtc b/bin/varnishtest/tests/i00004.vtc
index 0943f98..bb70176 100644
--- a/bin/varnishtest/tests/i00004.vtc
+++ b/bin/varnishtest/tests/i00004.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Verify the semantics of keep (timeout for conditional requests)"
+varnishtest "Verify the semantics of keep (timeout for conditional requests)"
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00005.vtc b/bin/varnishtest/tests/i00005.vtc
index 0bcac4f..983afb2 100644
--- a/bin/varnishtest/tests/i00005.vtc
+++ b/bin/varnishtest/tests/i00005.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Verify interactions of ttl, keep, grace and bans"
+varnishtest "Verify interactions of ttl, keep, grace and bans"
 
 ## Banned objects are not used for conditional requests
 
diff --git a/bin/varnishtest/tests/i00006.vtc b/bin/varnishtest/tests/i00006.vtc
index 87c6192..db15078 100644
--- a/bin/varnishtest/tests/i00006.vtc
+++ b/bin/varnishtest/tests/i00006.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Verify effects of ttl, keep and grace on expiration"
+varnishtest "Verify effects of ttl, keep and grace on expiration"
 
 ## Verify that an object's lifetime in the cache is
 ## obj.ttl + max(obj.grace, obj.keep)
diff --git a/bin/varnishtest/tests/i00007.vtc b/bin/varnishtest/tests/i00007.vtc
index 487c0d0..4a9b8c0 100644
--- a/bin/varnishtest/tests/i00007.vtc
+++ b/bin/varnishtest/tests/i00007.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Passes through responses to backend conditionals to the client if status != 304 or 200"
+varnishtest "Passes through responses to backend conditionals to the client if status != 304 or 200"
 
 # Testing a sample from each of the Nxx status codes