You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2011/09/07 21:55:11 UTC
svn commit: r1166356 - in /httpd/test/framework/trunk/t: apache/maxranges.t
apache/maxranges22.t conf/extra.conf.in
Author: covener
Date: Wed Sep 7 19:55:11 2011
New Revision: 1166356
URL: http://svn.apache.org/viewvc?rev=1166356&view=rev
Log:
split maxranges tests while 2.2 and trunk differ
Added:
httpd/test/framework/trunk/t/apache/maxranges22.t
- copied, changed from r1165637, httpd/test/framework/trunk/t/apache/maxranges.t
Modified:
httpd/test/framework/trunk/t/apache/maxranges.t
httpd/test/framework/trunk/t/conf/extra.conf.in
Modified: httpd/test/framework/trunk/t/apache/maxranges.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/maxranges.t?rev=1166356&r1=1166355&r2=1166356&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/maxranges.t (original)
+++ httpd/test/framework/trunk/t/apache/maxranges.t Wed Sep 7 19:55:11 2011
@@ -31,15 +31,29 @@ my @test_cases = (
{ url => "/maxranges/default/byteranges.txt" , h => "0-100", status => "206"},
{ url => "/maxranges/default/byteranges.txt" , h => $medrange, status => "206"},
{ url => "/maxranges/default/byteranges.txt" , h => $longrange, status => "200"},
- { url => "/maxranges/0/byteranges.txt" , h => "0-100", status => "206"},
- { url => "/maxranges/0/byteranges.txt" , h => "$medrange", status => "206"},
- { url => "/maxranges/0/byteranges.txt" , h => "$longrange", status => "206"},
+
+ { url => "/maxranges/default-explicit/byteranges.txt" , h => "0-100", status => "206"},
+ { url => "/maxranges/default-explicit/byteranges.txt" , h => $medrange, status => "206"},
+ { url => "/maxranges/default-explicit/byteranges.txt" , h => $longrange, status => "200"},
+
+ { url => "/maxranges/none/byteranges.txt" , h => "0-100", status => "200"},
+ { url => "/maxranges/none/byteranges.txt" , h => "$medrange", status => "200"},
+ { url => "/maxranges/none/byteranges.txt" , h => "$longrange", status => "200"},
+
+ { url => "/maxranges/1/merge/none/byteranges.txt" , h => "0-100", status => "200"},
+ { url => "/maxranges/1/merge/none/byteranges.txt" , h => "$medrange", status => "200"},
+ { url => "/maxranges/1/merge/none/byteranges.txt" , h => "$longrange", status => "200"},
+
{ url => "/maxranges/1/byteranges.txt" , h => "0-100", status => "206"},
{ url => "/maxranges/1/byteranges.txt" , h => "0-100,200-300", status => "200"},
{ url => "/maxranges/2/byteranges.txt" , h => "0-100,200-300", status => "206"},
{ url => "/maxranges/2/byteranges.txt" , h => "0-100,200-300,400-500", status => "200"},
+ { url => "/maxranges/unlimited/byteranges.txt" , h => "0-100", status => "206"},
+ { url => "/maxranges/unlimited/byteranges.txt" , h => "$medrange", status => "206"},
+ { url => "/maxranges/unlimited/byteranges.txt" , h => "$longrange", status => "206"},
+
);
-plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.3.15') || need_min_apache_version('2.2.21'),
+plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.3.15'),
need_module('mod_alias');
Copied: httpd/test/framework/trunk/t/apache/maxranges22.t (from r1165637, httpd/test/framework/trunk/t/apache/maxranges.t)
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/maxranges22.t?p2=httpd/test/framework/trunk/t/apache/maxranges22.t&p1=httpd/test/framework/trunk/t/apache/maxranges.t&r1=1165637&r2=1166356&rev=1166356&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/maxranges.t (original)
+++ httpd/test/framework/trunk/t/apache/maxranges22.t Wed Sep 7 19:55:11 2011
@@ -31,15 +31,12 @@ my @test_cases = (
{ url => "/maxranges/default/byteranges.txt" , h => "0-100", status => "206"},
{ url => "/maxranges/default/byteranges.txt" , h => $medrange, status => "206"},
{ url => "/maxranges/default/byteranges.txt" , h => $longrange, status => "200"},
- { url => "/maxranges/0/byteranges.txt" , h => "0-100", status => "206"},
- { url => "/maxranges/0/byteranges.txt" , h => "$medrange", status => "206"},
- { url => "/maxranges/0/byteranges.txt" , h => "$longrange", status => "206"},
{ url => "/maxranges/1/byteranges.txt" , h => "0-100", status => "206"},
{ url => "/maxranges/1/byteranges.txt" , h => "0-100,200-300", status => "200"},
{ url => "/maxranges/2/byteranges.txt" , h => "0-100,200-300", status => "206"},
{ url => "/maxranges/2/byteranges.txt" , h => "0-100,200-300,400-500", status => "200"},
);
-plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.3.15') || need_min_apache_version('2.2.21'),
+plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.2.21'),
need_module('mod_alias');
Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1166356&r1=1166355&r2=1166356&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Wed Sep 7 19:55:11 2011
@@ -825,8 +825,11 @@ LimitRequestFields 32
<IfVersion >= 2.3.15>
<IfModule mod_alias.c>
AliasMatch /maxranges/([^/])+/ @SERVERROOT@/htdocs/apache/chunked/byteranges.txt
- <Location /maxranges/0/>
- MaxRanges 0
+ <Location /maxranges/none/>
+ MaxRanges none
+ </Location>
+ <Location /maxranges/default-explicit/>
+ MaxRanges default
</Location>
<Location /maxranges/1/>
MaxRanges 1
@@ -834,6 +837,12 @@ LimitRequestFields 32
<Location /maxranges/2/>
MaxRanges 2
</Location>
+ <Location /maxranges/1/merge/none/>
+ MaxRanges none
+ </Location>
+ <Location /maxranges/unlimited/>
+ MaxRanges unlimited
+ </Location>
</IfModule>
</IfVersion>
<IfVersion >= 2.2.21>