You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by jo...@apache.org on 2005/09/23 15:39:49 UTC
svn commit: r291116 - in /httpd/test/trunk/perl-framework/t:
apache/pr35330.t conf/extra.conf.in htdocs/apache/htaccess/
htdocs/apache/htaccess/override/ htdocs/apache/htaccess/override/.htaccess
htdocs/apache/htaccess/override/hello.shtml
Author: jorton
Date: Fri Sep 23 06:39:38 2005
New Revision: 291116
URL: http://svn.apache.org/viewcvs?rev=291116&view=rev
Log:
- add regression test for PR 35330.
Added:
httpd/test/trunk/perl-framework/t/apache/pr35330.t
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess (with props)
httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml (with props)
Modified:
httpd/test/trunk/perl-framework/t/conf/extra.conf.in
Added: httpd/test/trunk/perl-framework/t/apache/pr35330.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/pr35330.t?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/pr35330.t (added)
+++ httpd/test/trunk/perl-framework/t/apache/pr35330.t Fri Sep 23 06:39:38 2005
@@ -0,0 +1,16 @@
+#
+# Regression test for PR 35330
+#
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+
+plan tests => 2, need 'include';
+
+my $r = GET '/apache/htaccess/override/hello.shtml';
+
+ok t_cmp($r->code, 200, "SSI was allowed for location");
+ok t_cmp($r->content, "hello", "file was served with correct content");
Modified: httpd/test/trunk/perl-framework/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/conf/extra.conf.in?rev=291116&r1=291115&r2=291116&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/conf/extra.conf.in (original)
+++ httpd/test/trunk/perl-framework/t/conf/extra.conf.in Fri Sep 23 06:39:38 2005
@@ -8,6 +8,14 @@
</Directory>
##
+## Options override test config
+##
+<Directory @SERVERROOT@/htdocs/apache/htaccess/override>
+ AllowOverride All
+ Options -Includes
+</Directory>
+
+##
## AcceptPathInfo test config
##
<IfDefine APACHE2>
Added: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess Fri Sep 23 06:39:38 2005
@@ -0,0 +1 @@
+Options +Includes
Propchange: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/.htaccess
------------------------------------------------------------------------------
svn:eol-style = native
Added: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml?rev=291116&view=auto
==============================================================================
--- httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml (added)
+++ httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml Fri Sep 23 06:39:38 2005
@@ -0,0 +1 @@
+hello
\ No newline at end of file
Propchange: httpd/test/trunk/perl-framework/t/htdocs/apache/htaccess/override/hello.shtml
------------------------------------------------------------------------------
svn:eol-style = native