[experimental-ims] 5f7a3e1 Merged conditional backend request feature

[Geoff Simmons]

commit 5f7a3e19f02628a8411b7f84a30bf9c92f59f7f3
Author: Geoff Simmons <geoff at uplex.de>
Date:   Thu Jun 2 21:42:28 2011 +0200

    Merged conditional backend request feature

diff --git a/bin/varnishtest/tests/i00000.vtc b/bin/varnishtest/tests/i00000.vtc
index 1f844da..86402cc 100644
--- a/bin/varnishtest/tests/i00000.vtc
+++ b/bin/varnishtest/tests/i00000.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "VCL compiler coverage test: conditional refresh extension"
 =======
 test "VCL compiler coverage test: conditional refresh extension"
@@ -9,6 +10,9 @@ test "VCL compiler coverage test: conditional refresh extension"
 =======
 varnishtest "VCL compiler coverage test: conditional refresh extension"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "VCL compiler coverage test: conditional refresh extension"
+>>>>>>> Merged conditional backend request feature
 
 ## 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 4bca908..61e4abf 100644
--- a/bin/varnishtest/tests/i00001.vtc
+++ b/bin/varnishtest/tests/i00001.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Test basic conditional requests to backends"
 =======
 test "Test basic conditional requests to backends"
@@ -9,6 +10,9 @@ test "Test basic conditional requests to backends"
 =======
 varnishtest "Test basic conditional requests to backends"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Test basic conditional requests to backends"
+>>>>>>> Merged conditional backend request feature
 
 ## 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 6d32c68..db380d5 100644
--- a/bin/varnishtest/tests/i00002.vtc
+++ b/bin/varnishtest/tests/i00002.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
 =======
 test "handling stale_obj in vcl_miss() and vcl_fetch()"
@@ -9,6 +10,9 @@ test "handling stale_obj in vcl_miss() and vcl_fetch()"
 =======
 varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "handling stale_obj in vcl_miss() and vcl_fetch()"
+>>>>>>> Merged conditional backend request feature
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00003.vtc b/bin/varnishtest/tests/i00003.vtc
index df9215e..ef65436 100644
--- a/bin/varnishtest/tests/i00003.vtc
+++ b/bin/varnishtest/tests/i00003.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Test some anticipated use cases for conditional backend requests"
 =======
 test "Test some anticipated use cases for conditional backend requests"
@@ -9,6 +10,9 @@ test "Test some anticipated use cases for conditional backend requests"
 =======
 varnishtest "Test some anticipated use cases for conditional backend requests"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Test some anticipated use cases for conditional backend requests"
+>>>>>>> Merged conditional backend request feature
 
 ## 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 5023b11..78436dd 100644
--- a/bin/varnishtest/tests/i00004.vtc
+++ b/bin/varnishtest/tests/i00004.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify the semantics of keep (timeout for conditional requests)"
 =======
 test "Verify the semantics of keep (timeout for conditional requests)"
@@ -9,6 +10,9 @@ test "Verify the semantics of keep (timeout for conditional requests)"
 =======
 varnishtest "Verify the semantics of keep (timeout for conditional requests)"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Verify the semantics of keep (timeout for conditional requests)"
+>>>>>>> Merged conditional backend request feature
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00005.vtc b/bin/varnishtest/tests/i00005.vtc
index 6845a3a..933d5e6 100644
--- a/bin/varnishtest/tests/i00005.vtc
+++ b/bin/varnishtest/tests/i00005.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify interactions of ttl, keep, grace and bans"
 =======
 test "Verify interactions of ttl, keep, grace and bans"
@@ -9,6 +10,9 @@ test "Verify interactions of ttl, keep, grace and bans"
 =======
 varnishtest "Verify interactions of ttl, keep, grace and bans"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Verify interactions of ttl, keep, grace and bans"
+>>>>>>> Merged conditional backend request feature
 
 ## Banned objects are not used for conditional requests
 
diff --git a/bin/varnishtest/tests/i00006.vtc b/bin/varnishtest/tests/i00006.vtc
index 6416c67..47e079d 100644
--- a/bin/varnishtest/tests/i00006.vtc
+++ b/bin/varnishtest/tests/i00006.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 varnishtest "Verify effects of ttl, keep and grace on expiration"
 =======
 test "Verify effects of ttl, keep and grace on expiration"
@@ -9,6 +10,9 @@ test "Verify effects of ttl, keep and grace on expiration"
 =======
 varnishtest "Verify effects of ttl, keep and grace on expiration"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Verify effects of ttl, keep and grace on expiration"
+>>>>>>> Merged conditional backend request feature
 
 ## 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 70eccad..3c19e20 100644
--- a/bin/varnishtest/tests/i00007.vtc
+++ b/bin/varnishtest/tests/i00007.vtc
@@ -2,6 +2,7 @@
 
 <<<<<<< HEAD
 <<<<<<< 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"
@@ -9,6 +10,9 @@ test "Passes through responses to backend conditionals to the client if status !
 =======
 varnishtest "Passes through responses to backend conditionals to the client if status != 304 or 200"
 >>>>>>> Merge conditional backend requests with current trunk
+=======
+test "Passes through responses to backend conditionals to the client if status != 304 or 200"
+>>>>>>> Merged conditional backend request feature
 
 # Testing a sample from each of the Nxx status codes