httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1829008 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/alias.t
Date Thu, 12 Apr 2018 21:13:56 GMT
Author: jailletc36
Date: Thu Apr 12 21:13:56 2018
New Revision: 1829008

URL: http://svn.apache.org/viewvc?rev=1829008&view=rev
Log:
According to the doc, this should be working since 2.4.8. (at least it works with 2.4.34-dev)

See https://httpd.apache.org/docs/2.4/mod/core.html#locationmatch

Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/modules/alias.t

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=1829008&r1=1829007&r2=1829008&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Thu Apr 12 21:13:56 2018
@@ -387,7 +387,7 @@
     ScriptAliasMatch /aliascgi-(.*) @SERVERROOT@/htdocs/modules/alias/$1
 
     <IfDefine APACHE2>
-        <IfVersion >= 2.5.0>
+        <IfVersion >= 2.4.8>
             <LocationMatch /expr/ali(?<number>[0-9])>
                 Alias @SERVERROOT@/htdocs/modules/alias/%{env:MATCH_NUMBER}.html
             </LocationMatch>

Modified: httpd/test/framework/trunk/t/modules/alias.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/alias.t?rev=1829008&r1=1829007&r2=1829008&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/alias.t (original)
+++ httpd/test/framework/trunk/t/modules/alias.t Thu Apr 12 21:13:56 2018
@@ -38,8 +38,8 @@ my %rm_rc = (
 #XXX: find something that'll on other platforms (/bin/sh aint it)
 my $script_tests = WINFU ? 0 : 4;
 
-my $tests = (keys %redirect) + (keys %rm_body) * (1 + have_min_apache_version("2.5.0")) *
10 +
-            (keys %rm_rc) * (1 + have_min_apache_version("2.5.0")) * 10 + have_min_apache_version("2.5.0")
* 11 + 12 + $script_tests;
+my $tests = (keys %redirect) + (keys %rm_body) * (1 + have_min_apache_version("2.4.8")) *
10 +
+            (keys %rm_rc) * (1 + have_min_apache_version("2.4.8")) * 10 + have_min_apache_version("2.4.8")
* 11 + 12 + $script_tests;
 
 #LWP required to follow redirects
 plan tests => $tests, need need_module('alias'), need_lwp;
@@ -62,7 +62,7 @@ for (my $i=0 ; $i <= 9 ; $i++) {
              "/ali$i");
 }
 
-if (have_min_apache_version("2.5.0")) {
+if (have_min_apache_version("2.4.8")) {
     t_debug "verifying expression alias match with /expr/ali[0-9].";
     for (my $i=0 ; $i <= 9 ; $i++) {
         ok t_cmp((GET_BODY "/expr/ali$i"),
@@ -95,7 +95,7 @@ foreach (sort keys %rm_body) {
     }
 }
 
-if (have_min_apache_version("2.5.0")) {
+if (have_min_apache_version("2.4.8")) {
     print "verifying body of perm and temp redirect match with expression support\n";
     foreach (sort keys %rm_body) {
         for (my $i=0 ; $i <= 9 ; $i++) {
@@ -123,7 +123,7 @@ foreach (keys %rm_rc) {
     }
 }
 
-if (have_min_apache_version("2.5.0")) {
+if (have_min_apache_version("2.4.8")) {
     print "verifying return code of seeother and gone redirect match with expression support\n";
     foreach (keys %rm_rc) {
         ## make LWP not follow the redirect since we
@@ -183,7 +183,7 @@ else {
     skip "skipping test without CGI module";
 }
 
-if (have_min_apache_version("2.5.0")) {
+if (have_min_apache_version("2.4.8")) {
     if (have_cgi) {
         ## with ScriptAlias in LocationMatch ##
         t_debug "verifying ScriptAlias in LocationMatch with /expr/aliascgi-script";



Mime
View raw message