Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 26702 invoked from network); 29 Dec 2007 14:54:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Dec 2007 14:54:27 -0000 Received: (qmail 86275 invoked by uid 500); 29 Dec 2007 14:54:14 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 86193 invoked by uid 500); 29 Dec 2007 14:54:14 -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 86181 invoked by uid 99); 29 Dec 2007 14:54:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2007 06:54:14 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of michael@metaparadigm.com designates 203.117.131.43 as permitted sender) Received: from [203.117.131.43] (HELO metamail-vm.metaparadigm.com) (203.117.131.43) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Dec 2007 14:53:50 +0000 Received: from [192.168.133.111] (cm15.gamma103.maxonline.com.sg [202.156.103.15]) (authenticated bits=0) by metamail-vm.metaparadigm.com (8.13.8/8.13.8/Debian-3) with ESMTP id lBTErdhZ016308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 29 Dec 2007 22:53:50 +0800 Message-ID: <47765F6F.9060605@metaparadigm.com> Date: Sat, 29 Dec 2007 22:53:35 +0800 From: Michael Clark Organization: Metaparadigm Pte Ltd User-Agent: Mozilla-Thunderbird 2.0.0.6 (X11/20071009) MIME-Version: 1.0 To: dev@httpd.apache.org Subject: [PATCH] Re: thoughts on ETags and mod_dav References: <4774D417.6030605@onlinehome.de> <1198851847.8554.32.camel@hlaptop> <4775A0D4.6080306@metaparadigm.com> <1198896277.5120.28.camel@hlaptop> <4775D8CA.8050506@metaparadigm.com> <47761670.8050901@onlinehome.de> In-Reply-To: <47761670.8050901@onlinehome.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV 0.90.1/5281/Sat Dec 29 19:34:28 2007 on metamail-vm X-Virus-Status: Clean X-Virus-Checked: Checked by ClamAV on apache.org While on the topic of ETags - I just picked up this regression in 2.2.7-dev Some innocuous changes to make ETags always 64bit in modules/http/http_etag.c broke DAV due to it's private dav_fs_getetag routine (ETags never matched in ap_meets_condition due to the different format). Patch below makes mod_dav consistent with the format in http_etag.c and fixes the cond_put regression with litmus Picked this up today while running litmus against 2.2.6 and 2.2.7-dev. I've filed a bug. Would be nice to get this verified and in before 2.2.7 Index: modules/dav/fs/repos.c =================================================================== --- modules/dav/fs/repos.c (revision 607400) +++ modules/dav/fs/repos.c (working copy) @@ -1777,10 +1777,10 @@ return apr_pstrdup(ctx->pool, ""); if (ctx->finfo.filetype != 0) { - return apr_psprintf(ctx->pool, "\"%lx-%lx-%lx\"", - (unsigned long) ctx->finfo.inode, - (unsigned long) ctx->finfo.size, - (unsigned long) ctx->finfo.mtime); + return apr_psprintf(ctx->pool, "\"%llx-%llx-%llx\"", + (apr_uint64_t) ctx->finfo.inode, + (apr_uint64_t) ctx->finfo.size, + (apr_uint64_t) ctx->finfo.mtime); } return apr_psprintf(ctx->pool, "\"%lx\"", (unsigned long) ctx->finfo.mtime);