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

[Geoff Simmons]

commit ad3b0f534245582d8b4cf18b58b6272bb4c3605e
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_http.c b/bin/varnishd/cache_http.c
index f042321..1279b60 100644
--- a/bin/varnishd/cache_http.c
+++ b/bin/varnishd/cache_http.c
@@ -70,10 +70,6 @@ void http_FilterMissingFields(struct worker *w, int fd, struct http *to,
     const struct http *fm);
 
 static enum VSL_tag_e
-
-void http_FilterMissingFields(struct worker *w, int fd, struct http *to,
-    const struct http *fm);
-
 http2shmlog(const struct http *hp, int t)
 {
 
diff --git a/bin/varnishtest/tests/i00000.vtc b/bin/varnishtest/tests/i00000.vtc
index 112703a..1f844da 100644
--- a/bin/varnishtest/tests/i00000.vtc
+++ b/bin/varnishtest/tests/i00000.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "VCL compiler coverage test: conditional refresh extension"
 =======
 test "VCL compiler coverage test: conditional refresh extension"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "VCL compiler coverage test: conditional refresh extension"
+>>>>>>> Merge conditional backend requests with current trunk
 
 ## 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 814ee1d..4bca908 100644
--- a/bin/varnishtest/tests/i00001.vtc
+++ b/bin/varnishtest/tests/i00001.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Test basic conditional requests to backends"
 =======
 test "Test basic conditional requests to backends"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Test basic conditional requests to backends"
+>>>>>>> Merge conditional backend requests with current trunk
 
 ## 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 0817008..6d32c68 100644
--- a/bin/varnishtest/tests/i00002.vtc
+++ b/bin/varnishtest/tests/i00002.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
 =======
 test "handling stale_obj in vcl_miss() and vcl_fetch()"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
+>>>>>>> Merge conditional backend requests with current trunk
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00003.vtc b/bin/varnishtest/tests/i00003.vtc
index 6711f61..df9215e 100644
--- a/bin/varnishtest/tests/i00003.vtc
+++ b/bin/varnishtest/tests/i00003.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Test some anticipated use cases for conditional backend requests"
 =======
 test "Test some anticipated use cases for conditional backend requests"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Test some anticipated use cases for conditional backend requests"
+>>>>>>> Merge conditional backend requests with current trunk
 
 ## 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 701e167..5023b11 100644
--- a/bin/varnishtest/tests/i00004.vtc
+++ b/bin/varnishtest/tests/i00004.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify the semantics of keep (timeout for conditional requests)"
 =======
 test "Verify the semantics of keep (timeout for conditional requests)"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Verify the semantics of keep (timeout for conditional requests)"
+>>>>>>> Merge conditional backend requests with current trunk
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00005.vtc b/bin/varnishtest/tests/i00005.vtc
index 24e3968..6845a3a 100644
--- a/bin/varnishtest/tests/i00005.vtc
+++ b/bin/varnishtest/tests/i00005.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify interactions of ttl, keep, grace and bans"
 =======
 test "Verify interactions of ttl, keep, grace and bans"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Verify interactions of ttl, keep, grace and bans"
+>>>>>>> Merge conditional backend requests with current trunk
 
 ## Banned objects are not used for conditional requests
 
diff --git a/bin/varnishtest/tests/i00006.vtc b/bin/varnishtest/tests/i00006.vtc
index 6eb6b2f..6416c67 100644
--- a/bin/varnishtest/tests/i00006.vtc
+++ b/bin/varnishtest/tests/i00006.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify effects of ttl, keep and grace on expiration"
 =======
 test "Verify effects of ttl, keep and grace on expiration"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Verify effects of ttl, keep and grace on expiration"
+>>>>>>> Merge conditional backend requests with current trunk
 
 ## 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 31193f9..70eccad 100644
--- a/bin/varnishtest/tests/i00007.vtc
+++ b/bin/varnishtest/tests/i00007.vtc
@@ -1,10 +1,14 @@
 # $Id$
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Passes through responses to backend conditionals to the client if status != 304 or 200"
 =======
 test "Passes through responses to backend conditionals to the client if status != 304 or 200"
 >>>>>>> Merged conditional backend request feature
+=======
+varnishtest "Passes through responses to backend conditionals to the client if status != 304 or 200"
+>>>>>>> Merge conditional backend requests with current trunk
 
 # Testing a sample from each of the Nxx status codes