Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1213341 - in /httpd/test/framework/trunk/t/apache:
 cfg_getline.t expr.t
Date: Mon, 12 Dec 2011 18:05:46 -0000
To: cvs@httpd.apache.org
From: sf@apache.org
Message-Id: <20111212180546.C24C723889E1@eris.apache.org>

Author: sf
Date: Mon Dec 12 18:05:46 2011
New Revision: 1213341

URL: http://svn.apache.org/viewvc?rev=1213341&view=rev
Log:
Remove tests that use very long .htaccess lines, which are forbidden again
since r1213338

Modified:
    httpd/test/framework/trunk/t/apache/cfg_getline.t
    httpd/test/framework/trunk/t/apache/expr.t

Modified: httpd/test/framework/trunk/t/apache/cfg_getline.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/cfg_getline.t?rev=1213341&r1=1213340&r2=1213341&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/cfg_getline.t (original)
+++ httpd/test/framework/trunk/t/apache/cfg_getline.t Mon Dec 12 18:05:46 2011
@@ -13,22 +13,15 @@ Apache::TestRequest::user_agent(keep_ali
 
 my $dir_foo = Apache::Test::vars('serverroot') . '/htdocs/cfg_getline';
 
+# XXX: htaccess is limited to 8190 chars, would need different test
+# XXX: method to test longer lines
 my @test_cases = (100, 196 .. 202, 396 .. 402 , 596 .. 602 , 1016 .. 1030,
-                  8170 .. 8196 , 10000, 50000);
+                  8170 .. 8190);
 plan tests => 2 * scalar(@test_cases), need need_lwp,
                                        need_module('mod_include'),
                                        need_module('mod_setenvif');
 
-my $max_len;
-$max_len = 8192 - 2  # trailing \n and \0
-    unless (have_min_apache_version("2.3.15"));
-
 foreach my $len (@test_cases) {
-    if ($max_len && $len > $max_len) {
-        skip "Skipping test with length $len with httpd < 2.3.15" for (1, 2);
-	next;
-    }
-
     my $prefix = 'SetEnvIf User-Agent ^ testvar=';
     my $expect = 'a' x ($len - length($prefix));
     my $file = File::Spec->catfile(Apache::Test::vars('serverroot'), 'htdocs',

Modified: httpd/test/framework/trunk/t/apache/expr.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/expr.t?rev=1213341&r1=1213340&r2=1213341&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/expr.t (original)
+++ httpd/test/framework/trunk/t/apache/expr.t Mon Dec 12 18:05:46 2011
@@ -225,20 +225,6 @@ if (have_min_apache_version("2.3.13")) {
     ));
 }
 
-my $long_expr;
-if (have_min_apache_version("2.3.15")) {
-    # should support long expressions
-    $long_expr= 1;
-}
-push(@test_cases,
-     # longest string/regex with 2.3.15+ is 8191
-     [("true && " x 2000) . "true"       => $long_expr ? 1 : undef],
-     ["-n '" . ("a" x 8191) . "'"        => $long_expr ? 1 : undef],
-     ["-n '" . ("a" x 9000) . "'"        => undef],
-     ["'y' =~ /" . ("a" x 8191) . "/"    => $long_expr ? 0 : undef],
-     ["'y' =~ /" . ("a" x 9000) . "/x"   => undef],
-);
-
 plan tests => scalar(@test_cases) + 1,
                   need need_lwp,
                   need_module('mod_authz_core'),