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 2019/03/21 11:46:53 UTC
svn commit: r1855981 - in /httpd/test/framework/trunk/t:
apache/mergeslashes.t conf/core.conf.in
Author: covener
Date: Thu Mar 21 11:46:53 2019
New Revision: 1855981
URL: http://svn.apache.org/viewvc?rev=1855981&view=rev
Log:
enable tests for 2.4
Submitted By: Petr Gajdos <pg...@suse.cz>
Modified:
httpd/test/framework/trunk/t/apache/mergeslashes.t
httpd/test/framework/trunk/t/conf/core.conf.in
Modified: httpd/test/framework/trunk/t/apache/mergeslashes.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/mergeslashes.t?rev=1855981&r1=1855980&r2=1855981&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/mergeslashes.t (original)
+++ httpd/test/framework/trunk/t/apache/mergeslashes.t Thu Mar 21 11:46:53 2019
@@ -21,7 +21,7 @@ my @test_cases = (
[ "GET /authz_core/a//b/c/index.html HTTP/1.1\r\nHost: merge-disabled\r\n\r\n" => 403, "a// matches locationmatch"],
[ "GET /authz_core/a/b/c//index.html HTTP/1.1\r\nHost: merge-disabled\r\n\r\n" => 200, "c// doesn't match locationmatch"],
);
-plan tests => scalar(@test_cases), need_min_apache_version('2.5.1');
+plan tests => scalar(@test_cases), need_min_apache_version('2.4.39');
foreach my $t (@test_cases) {
Modified: httpd/test/framework/trunk/t/conf/core.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/core.conf.in?rev=1855981&r1=1855980&r2=1855981&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/core.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/core.conf.in Thu Mar 21 11:46:53 2019
@@ -17,26 +17,28 @@
</VirtualHost>
# MergeSlashes
-<VirtualHost merge-default:core>
- ServerName merge-default
- <Directory @DocumentRoot@/authz_core/>
- require all granted
- </Directory>
- <LocationMatch ^/authz_core/a/b/c/index.html>
- require all denied
- </LocationMatch>
-</virtualHost>
-<VirtualHost merge-disabled:core>
- ServerName merge-disabled
- MergeSlashes OFF
- <Directory @DocumentRoot@/authz_core/>
- require all granted
- </Directory>
- <LocationMatch ^/authz_core/a/b/c/index.html>
- require all denied
- </LocationMatch>
- <LocationMatch ^/authz_core/a//b/c/index.html>
- require all denied
- </LocationMatch>
-</virtualHost>
+<IfVersion >= 2.4.39>
+ <VirtualHost merge-default:core>
+ ServerName merge-default
+ <Directory @DocumentRoot@/authz_core/>
+ require all granted
+ </Directory>
+ <LocationMatch ^/authz_core/a/b/c/index.html>
+ require all denied
+ </LocationMatch>
+ </virtualHost>
+ <VirtualHost merge-disabled:core>
+ ServerName merge-disabled
+ MergeSlashes OFF
+ <Directory @DocumentRoot@/authz_core/>
+ require all granted
+ </Directory>
+ <LocationMatch ^/authz_core/a/b/c/index.html>
+ require all denied
+ </LocationMatch>
+ <LocationMatch ^/authz_core/a//b/c/index.html>
+ require all denied
+ </LocationMatch>
+ </virtualHost>
+</IfVersion>