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 2021/06/03 12:16:50 UTC
svn commit: r1890423 - in /httpd/test/framework/trunk/t:
apache/mergeslashes.t conf/core.conf.in
Author: covener
Date: Thu Jun 3 12:16:50 2021
New Revision: 1890423
URL: http://svn.apache.org/viewvc?rev=1890423&view=rev
Log:
test "mergeslashes off" cases fixed in .47
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=1890423&r1=1890422&r2=1890423&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/mergeslashes.t (original)
+++ httpd/test/framework/trunk/t/apache/mergeslashes.t Thu Jun 3 12:16:50 2021
@@ -20,7 +20,10 @@ my @test_cases = (
[ "GET /authz_core/a//b/c/index.html HTTP/1.1\r\nHost: merge-default\r\nConnection: close\r\n\r\n" => 403, "a// should be merged"],
[ "GET /authz_core/a//b/c/index.html HTTP/1.1\r\nHost: merge-disabled\r\nConnection: close\r\n\r\n" => 403, "a// matches locationmatch"],
[ "GET /authz_core/a/b/c//index.html HTTP/1.1\r\nHost: merge-disabled\r\nConnection: close\r\n\r\n" => 200, "c// doesn't match locationmatch"],
+ [ "GET /authz_core/a/b/d/index.html HTTP/1.1\r\nHost: merge-disabled\r\nConnection: close\r\n\r\n" => 403, "baseline failed", need_min_apache_version('2.4.47')],
+ [ "GET /authz_core/a/b//d/index.html HTTP/1.1\r\nHost: merge-disabled\r\nConnection: close\r\n\r\n" => 403, "b//d not merged for Location with OFF",need_min_apache_version('2.4.47')],
);
+
plan tests => scalar(@test_cases), need_min_apache_version('2.4.39');
@@ -28,8 +31,13 @@ plan tests => scalar(@test_cases), need_
my $req = $t->[0];
my $expect = $t->[1];
my $desc = $t->[2];
+ my $cond = $t->[3];
my $decoded;
+ if (defined($cond) && !$cond) {
+ skip("n/a");
+ }
+
my $sock = Apache::TestRequest::vhost_socket("core");
if (!$sock) {
print "# failed to connect\n";
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=1890423&r1=1890422&r2=1890423&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/core.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/core.conf.in Thu Jun 3 12:16:50 2021
@@ -40,6 +40,9 @@ MaxMemFree 1
<LocationMatch ^/authz_core/a//b/c/index.html>
require all denied
</LocationMatch>
+ <Location /authz_core/a/b/d>
+ require all denied
+ </Location>
<ifModule rewrite_module>
<Location /CVE-2020-1927/>
RewriteEngine ON