httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1166643 - in /httpd/test/framework/trunk/t: apache/maxranges.t apache/maxranges22.t conf/extra.conf.in
Date Thu, 08 Sep 2011 12:02:51 GMT
Author: covener
Date: Thu Sep  8 12:02:50 2011
New Revision: 1166643

URL: http://svn.apache.org/viewvc?rev=1166643&view=rev
Log:
backported, make maxranges the same in 2.2.21 and 2.3.15 again.


Modified:
    httpd/test/framework/trunk/t/apache/maxranges.t
    httpd/test/framework/trunk/t/apache/maxranges22.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=1166643&r1=1166642&r2=1166643&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/maxranges.t (original)
+++ httpd/test/framework/trunk/t/apache/maxranges.t Thu Sep  8 12:02:50 2011
@@ -53,7 +53,7 @@ my @test_cases = (
     { url => "/maxranges/unlimited/byteranges.txt" ,       h => "$longrange", status
=> "206"},
 
 );
-plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.3.15'),
+plan tests => scalar(@test_cases), need need_lwp, need_min_apache_version('2.3.15') ||
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=1166643&r1=1166642&r2=1166643&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Thu Sep  8 12:02:50 2011
@@ -845,11 +845,14 @@ LimitRequestFields    32
       </Location>
     </IfModule>
   </IfVersion>
-  <IfVersion < 2.2.21>
+  <IfVersion >= 2.2.21>
     <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
@@ -857,6 +860,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>
 



Mime
View raw message