Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 93040 invoked from network); 17 Mar 2009 14:16:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Mar 2009 14:16:49 -0000 Received: (qmail 81641 invoked by uid 500); 17 Mar 2009 14:16:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 81589 invoked by uid 500); 17 Mar 2009 14:16:48 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 81580 invoked by uid 99); 17 Mar 2009 14:16:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2009 07:16:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2009 14:16:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5F3AD238889F; Tue, 17 Mar 2009 14:16:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 17 Mar 2009 14:16:18 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090317141619.5F3AD238889F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 + + Options Includes + XBitHack on + + 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 @@ + +xxxx 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";