Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 27310 invoked from network); 3 Nov 2008 17:26:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2008 17:26:29 -0000 Received: (qmail 90168 invoked by uid 500); 3 Nov 2008 17:26:32 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 90099 invoked by uid 500); 3 Nov 2008 17:26:31 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 90090 invoked by uid 99); 3 Nov 2008 17:26:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 09:26:31 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jim@jagunet.com designates 209.133.192.6 as permitted sender) Received: from [209.133.192.6] (HELO jaguNET.com) (209.133.192.6) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 17:25:15 +0000 Received: from [10.30.1.175] ([63.85.187.2]) by devsys.jaguNET.com (8.13.8/8.13.6) with ESMTP id mA3HOeoF077761 for ; Mon, 3 Nov 2008 12:24:41 -0500 (EST) (envelope-from jim@jaguNET.com) Message-Id: From: Jim Jagielski To: dev@httpd.apache.org In-Reply-To: <490C3569.3080909@apache.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v929.2) Subject: Re: svn commit: r708902 - /httpd/httpd/trunk/modules/metadata/mod_expires.c Date: Mon, 3 Nov 2008 12:24:40 -0500 References: <20081029133259.A44BF23888EB@eris.apache.org> <490C3569.3080909@apache.org> X-Mailer: Apple Mail (2.929.2) X-Virus-Checked: Checked by ClamAV on apache.org On Nov 1, 2008, at 6:54 AM, Ruediger Pluem wrote: > > This causes failures in the perl framework: > > t/modules/expires.t 92 15 16.30% 4 10 14 17-18 22 > 29-30 34- > 35 38 42 46 48 50 > > But IMHO the code is now correct after the patch and the tests are > wrong. The following > patch makes the tests pass again: > > Index: t/modules/expires.t > =================================================================== > --- t/modules/expires.t (Revision 707830) > +++ t/modules/expires.t (Arbeitskopie) > @@ -231,6 +231,13 @@ > if ($exp_conf =~ /^([A|M])(\d+)$/) { > $exp_type = $1; > $expected = $2; > + ## With modification date as base expire times can be in > the past > + ## Correct behaviour for the server in this case is to set > expires > + ## time equal to access time. > + if (($exp_type eq 'M') > + && ($headers{access} > $headers{modified} + $expected)) { > + $expected = $headers{access} - $headers{modified}; > + } > } else { > print STDERR "\n\ndoom: $exp_conf\n\n"; > return 0; > > Comments? > Thanks! I forgot to mention that the test cases were bad, and had intended to fix them, but time got away from me. Thanks for following up! +1