Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 80527 invoked from network); 11 Aug 2005 17:42:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Aug 2005 17:42:19 -0000 Received: (qmail 55168 invoked by uid 500); 11 Aug 2005 17:42:15 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 55120 invoked by uid 500); 11 Aug 2005 17:42:15 -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 55107 invoked by uid 99); 11 Aug 2005 17:42:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2005 10:42:15 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [128.195.24.168] (HELO scotch.ics.uci.edu) (128.195.24.168) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Aug 2005 10:42:36 -0700 Received: from localhost (scotch.ics.uci.edu [128.195.24.168]) (authenticated bits=0) by scotch.ics.uci.edu (8.12.11/8.12.11) with ESMTP id j7BHfZMi017538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 11 Aug 2005 10:41:37 -0700 (PDT) Date: Thu, 11 Aug 2005 10:42:26 -0700 From: Justin Erenkrantz To: dev@httpd.apache.org Subject: Re: [PATCH] fix incorrect 304's responses when cache is unwritable Message-ID: <1BB996656F48C1111D002783@Justin-Erenkrantzs-Computer.local> In-Reply-To: <20050811092137.GA6507@stdlib.net> References: <20050807164843.GA22232@stdlib.net> <42F66813.3020606@gmx.de> <20050807212924.GA24773@stdlib.net> <42F68F01.5020508@gmx.de> <20050808000125.GB25723@stdlib.net> <42F718EB.50802@gmx.de> <20050808122546.GA29122@stdlib.net> <5DB584572E52F420DFCC01A4@st-augustin.ics.uci.edu> <20050811092137.GA6507@stdlib.net> X-Mailer: Mulberry/4.0.0 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Spam-Checker-Version: SpamAssassin 3.1.0-r156655 (2005-03-09) on scotch.ics.uci.edu X-Virus-Scanned: ClamAV version 0.84, clamav-milter version 0.84e on scotch.ics.uci.edu X-Virus-Status: Clean X-Virus-Checked: Checked by ClamAV on apache.org X-Old-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED autolearn=no version=3.1.0-r156655 X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --On August 11, 2005 10:21:37 AM +0100 Colm MacCarthaigh wrote: > On Wed, Aug 10, 2005 at 03:38:17PM -0700, Justin Erenkrantz wrote: >> --On August 8, 2005 1:25:46 PM +0100 Colm MacCarthaigh >> wrote: >> >> > O.k., I've merged our two patches, but I've changed a few things, tell >> > me if there's anothing you think is wrong; >> >> Would you mind writing up a log message for this patch? > > No problem; > > Fix incorrectly served 304 responses when expired cache entity > is valid, but cache is unwritable and headers cannot be updated. > Submitted by colm stdlib.net > > Remove entities from the cache when re-validation receives a > 404 or other content-no-longer-present error. > Submitted by ruediger.pluem vodafone.com Thanks! I've committed this in r231486, r231487, and r231488. I re-split them up to make it easier for people to review the commits. However, there remains an issue in mod_disk_cache's remove_url: I don't think it properly handles removing the Vary condition files. I went ahead and committed it because it gets us closer to the desired solution. The code will remove the header file and the disk file; but it also likely needs to go up a 'level' and remove all variants. Because if we get a 404 on a varied entity, it also means that all variants should be removed, no? I think what this means is that we need to recompute the hash - verify that it either meets the 'base' URL (we're done then), or we need to then go through and wack all of the varied headers/bodies and such. Now, I *think* it's possible after Paul's latest rewrite to just wack some subdirectories - but I'm fuzzy on this. (Paul??) Does this make sense? Or, am I missing something? -- justin