[testsuite] MergeSlashes was added recently

[pgajdos]

Hello,

please see the proposed patch in the attachement.

Petr


Index: httpd-framework/t/apache/mergeslashes.t
===================================================================
--- httpd-framework.orig/t/apache/mergeslashes.t	2019-03-21 08:49:48.086794262 +0100
+++ httpd-framework/t/apache/mergeslashes.t	2019-03-21 10:04:58.800351025 +0100
@@ -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) {
Index: httpd-framework/t/conf/core.conf.in
===================================================================
--- httpd-framework.orig/t/conf/core.conf.in	2019-03-21 08:49:48.578796993 +0100
+++ httpd-framework/t/conf/core.conf.in	2019-03-21 10:06:04.708729107 +0100
@@ -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>