Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 17093 invoked from network); 1 Dec 2009 09:00:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Dec 2009 09:00:05 -0000 Received: (qmail 74762 invoked by uid 500); 1 Dec 2009 09:00:04 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 74671 invoked by uid 500); 1 Dec 2009 09:00:04 -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 74662 invoked by uid 99); 1 Dec 2009 09:00:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 09:00:04 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 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, 01 Dec 2009 09:00:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F0CC23888E8; Tue, 1 Dec 2009 08:59:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885694 - /httpd/httpd/trunk/modules/cache/mod_disk_cache.c Date: Tue, 01 Dec 2009 08:59:42 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091201085942.1F0CC23888E8@eris.apache.org> Author: wrowe Date: Tue Dec 1 08:59:41 2009 New Revision: 885694 URL: http://svn.apache.org/viewvc?rev=885694&view=rev Log: Revert nonsense I introduced in r885689; solve cl test correctly Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=885694&r1=885693&r2=885694&view=diff ============================================================================== --- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original) +++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Tue Dec 1 08:59:41 2009 @@ -1082,8 +1082,8 @@ file_cache_errorcleanup(dobj, r); return APR_EGENERAL; } - if (cl_header > 0) { - apr_size_t cl = (apr_size_t) apr_atoi64(cl_header); + if (cl_header) { + apr_off_t cl = (apr_off_t) apr_atoi64(cl_header); if ((errno == 0) && (dobj->file_size != cl)) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "disk_cache: URL %s didn't receive complete response, not caching",