# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1323964091 -10800
# Node ID 101b092b67e28423f6d6e4701539873c02a3b4b2
# Parent  eb4c40260ee7664c3ce3b26535e93dff411c6aaa
Tests: header merge bugs fixed 1.1.8/1.0.11, remove TODO.

diff --git a/fastcgi_merge_params.t b/fastcgi_merge_params.t
--- a/fastcgi_merge_params.t
+++ b/fastcgi_merge_params.t
@@ -74,26 +74,13 @@ EOF
 
 like(http_get_ims('/'), qr/ims=;/,
 	'if-modified-since cleared with cache');
-
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/'), qr/iums=;/,
 	'if-unmodified-since cleared with cache');
-
-}
-
 like(http_get_ims('/'), qr/blah=blah;/,
 	'custom params with cache');
 
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/no/'), qr/ims=blah;/,
 	'if-modified-since preserved without cache');
-
-}
-
 like(http_get_ims('/no/'), qr/iums=blah;/,
 	'if-unmodified-since preserved without cache');
 like(http_get_ims('/'), qr/blah=blah;/,
@@ -101,14 +88,8 @@ like(http_get_ims('/'), qr/blah=blah;/,
 
 like(http_get_ims('/custom/'), qr/ims=;/,
 	'if-modified-since cleared with cache custom');
-
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/custom/'), qr/iums=;/,
 	'if-unmodified-since cleared with cache custom');
-}
-
 like(http_get_ims('/custom/'), qr/blah=custom;/,
 	'custom params with cache custom');
 
diff --git a/fastcgi_merge_params2.t b/fastcgi_merge_params2.t
--- a/fastcgi_merge_params2.t
+++ b/fastcgi_merge_params2.t
@@ -67,16 +67,11 @@ EOF
 
 ###############################################################################
 
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/'), qr/ims=;/,
 	'if-modified-since cleared with cache');
 like(http_get_ims('/'), qr/iums=;/,
 	'if-unmodified-since cleared with cache');
 
-}
-
 like(http_get_ims('/no/'), qr/ims=blah;/,
 	'if-modified-since preserved without cache');
 like(http_get_ims('/no/'), qr/iums=blah;/,
diff --git a/proxy_merge_headers.t b/proxy_merge_headers.t
--- a/proxy_merge_headers.t
+++ b/proxy_merge_headers.t
@@ -79,22 +79,12 @@ EOF
 like(http_get_ims('/'), qr/ims=;blah=blah;/,
 	'if-modified-since cleared with cache');
 
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/no/'), qr/ims=blah;blah=blah;/,
 	'if-modified-since preserved without cache');
 
-}
-
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/setbody/'), qr/blah=blah;/,
 	'proxy_set_header inherited with proxy_set_body');
 
-}
-
 ###############################################################################
 
 sub http_get_ims {
diff --git a/scgi_merge_params.t b/scgi_merge_params.t
--- a/scgi_merge_params.t
+++ b/scgi_merge_params.t
@@ -75,26 +75,13 @@ EOF
 
 like(http_get_ims('/'), qr/ims=;/,
 	'if-modified-since cleared with cache');
-
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/'), qr/iums=;/,
 	'if-unmodified-since cleared with cache');
-
-}
-
 like(http_get_ims('/'), qr/blah=blah;/,
 	'custom params with cache');
 
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/no/'), qr/ims=blah;/,
 	'if-modified-since preserved without cache');
-
-}
-
 like(http_get_ims('/no/'), qr/iums=blah;/,
 	'if-unmodified-since preserved without cache');
 like(http_get_ims('/'), qr/blah=blah;/,
@@ -102,14 +89,8 @@ like(http_get_ims('/'), qr/blah=blah;/,
 
 like(http_get_ims('/custom/'), qr/ims=;/,
 	'if-modified-since cleared with cache custom');
-
-TODO: {
-local $TODO = 'not yet';
-
 like(http_get_ims('/custom/'), qr/iums=;/,
 	'if-unmodified-since cleared with cache custom');
-}
-
 like(http_get_ims('/custom/'), qr/blah=custom;/,
 	'custom params with cache custom');