Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 78262 invoked from network); 27 Sep 2006 14:21:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Sep 2006 14:21:33 -0000 Received: (qmail 82434 invoked by uid 500); 27 Sep 2006 14:21:30 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 82358 invoked by uid 500); 27 Sep 2006 14:21:30 -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 82316 invoked by uid 99); 27 Sep 2006 14:21:29 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Sep 2006 07:21:29 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=minfrin@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:51639] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id F6/40-27564-9E88A154 for ; Wed, 27 Sep 2006 07:21:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 773691A981D; Wed, 27 Sep 2006 07:21:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450453 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c Date: Wed, 27 Sep 2006 14:21:27 -0000 To: cvs@httpd.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060927142127.773691A981D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: minfrin Date: Wed Sep 27 07:21:26 2006 New Revision: 450453 URL: http://svn.apache.org/viewvc?view=rev&rev=450453 Log: mod_cache: Eliminate a bogus error in the log when a filter returns AP_FILTER_ERROR. Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/cache/mod_cache.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=450453&r1=450452&r2=450453 ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Sep 27 07:21:26 2006 @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] + *) mod_cache: Eliminate a bogus error in the log when a filter returns + AP_FILTER_ERROR. [Niklas Edmundsson ] + *) mod_disk_cache: Make caching of large files possible on 32bit machines by determining whether the cached file should be copied on disk rather than loaded into RAM. PR39380 [Niklas Edmundsson ] Modified: httpd/httpd/trunk/modules/cache/mod_cache.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?view=diff&rev=450453&r1=450452&r2=450453 ============================================================================== --- httpd/httpd/trunk/modules/cache/mod_cache.c (original) +++ httpd/httpd/trunk/modules/cache/mod_cache.c Wed Sep 27 07:21:26 2006 @@ -244,10 +244,12 @@ out = apr_brigade_create(r->pool, r->connection->bucket_alloc); rv = ap_pass_brigade(r->output_filters, out); if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, - "cache: error returned while trying to return %s " - "cached data", - cache->provider_name); + if(rv != AP_FILTER_ERROR) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server, + "cache: error returned while trying to return %s " + "cached data", + cache->provider_name); + } return rv; }