Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F727117A7 for ; Wed, 30 Apr 2014 16:34:48 +0000 (UTC) Received: (qmail 97391 invoked by uid 500); 30 Apr 2014 16:34:40 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 97231 invoked by uid 500); 30 Apr 2014 16:34:40 -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 97135 invoked by uid 99); 30 Apr 2014 16:34:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2014 16:34:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 30 Apr 2014 16:34:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B37972388906; Wed, 30 Apr 2014 16:34:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591390 - /httpd/httpd/trunk/modules/cache/mod_cache.c Date: Wed, 30 Apr 2014 16:34:15 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140430163415.B37972388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ylavic Date: Wed Apr 30 16:34:15 2014 New Revision: 1591390 URL: http://svn.apache.org/r1591390 Log: mod_cache: follow up to r1591322 Avoid one unnecessary test when checking 304 contradictions. Modified: httpd/httpd/trunk/modules/cache/mod_cache.c Modified: httpd/httpd/trunk/modules/cache/mod_cache.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1591390&r1=1591389&r2=1591390&view=diff ============================================================================== --- httpd/httpd/trunk/modules/cache/mod_cache.c (original) +++ httpd/httpd/trunk/modules/cache/mod_cache.c Wed Apr 30 16:34:15 2014 @@ -1134,7 +1134,7 @@ static apr_status_t cache_save_filter(ap * as per RFC2616 Section 10.3.5 */ if (cache_header_cmp(r->pool, left, right, "ETag")) { - ehs = (ehs) ? apr_pstrcat(r->pool, ehs, ", ETag", NULL) : "ETag"; + ehs = "ETag"; } for (eh = MOD_CACHE_ENTITY_HEADERS; *eh && !reason; ++eh) { if (cache_header_cmp(r->pool, left, right, *eh)) {