You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2009/03/17 15:16:18 UTC
svn commit: r755261 - in /httpd/test/framework/trunk/t: conf/include.conf.in
htdocs/modules/include/xbithack/both/
htdocs/modules/include/xbithack/both/timefmt.shtml modules/include.t
Author: jorton
Date: Tue Mar 17 14:16:18 2009
New Revision: 755261
URL: http://svn.apache.org/viewvc?rev=755261&view=rev
Log:
Add test case for PR 39369.
Submitted by: Dan Poirier <poirier pobox.com>
Added:
httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/
httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml (with props)
Modified:
httpd/test/framework/trunk/t/conf/include.conf.in
httpd/test/framework/trunk/t/modules/include.t
Modified: httpd/test/framework/trunk/t/conf/include.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/include.conf.in?rev=755261&r1=755260&r2=755261&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/include.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/include.conf.in Tue Mar 17 14:16:18 2009
@@ -22,6 +22,11 @@
XBitHack on
</Directory>
+ <Directory @SERVERROOT@/htdocs/modules/include/xbithack/both>
+ Options Includes
+ XBitHack on
+ </Directory>
+
<Directory @SERVERROOT@/htdocs/modules/include/xbithack/full>
Options +IncludesNOEXEC
XBitHack full
Added: httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml?rev=755261&view=auto
==============================================================================
--- httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml (added)
+++ httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml Tue Mar 17 14:16:18 2009
@@ -0,0 +1,2 @@
+<!--#config timefmt="%Y" -->
+xx<!--#echo var="DATE_LOCAL" -->xx
Propchange: httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpd/test/framework/trunk/t/htdocs/modules/include/xbithack/both/timefmt.shtml
------------------------------------------------------------------------------
svn:executable = *
Modified: httpd/test/framework/trunk/t/modules/include.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/include.t?rev=755261&r1=755260&r2=755261&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/include.t (original)
+++ httpd/test/framework/trunk/t/modules/include.t Tue Mar 17 14:16:18 2009
@@ -214,10 +214,10 @@
}
# in addition to %tests, there are 1 fsize and 1 flastmod test,
-# 1 GET test, 2 query string tests, 13 XBitHack tests and 14
+# 1 GET test, 2 query string tests, 14 XBitHack tests and 14
# tests that use mod_bucketeer to construct brigades for mod_include
-plan tests => (scalar keys %tests) + @patterns + 32,
+plan tests => (scalar keys %tests) + @patterns + 33,
todo => \@todo,
need need_lwp, need_module 'include';
@@ -387,6 +387,17 @@
);
}
+ # test timefmt - make sure filter only inserted once
+ # if Option Include and xbithack both say to process
+ $doc = "xbithack/both/timefmt.shtml";
+ my @now = localtime();
+ my $year = $now[5] + 1900;
+ chmod 0555, "$htdocs/$dir$doc";
+ ok t_cmp(super_chomp(GET_BODY "$dir$doc"),
+ "xx${year}xx",
+ "XBitHack both [timefmt]"
+ );
+
# test xbithack full
$doc = "xbithack/full/test.html";
chmod 0444, "$htdocs/$dir$doc";