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 DB85D913B for ; Mon, 23 Jul 2012 15:22:16 +0000 (UTC) Received: (qmail 1957 invoked by uid 500); 23 Jul 2012 15:22:16 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 1766 invoked by uid 500); 23 Jul 2012 15:22:16 -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 1733 invoked by uid 99); 23 Jul 2012 15:22:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jul 2012 15:22:15 +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; Mon, 23 Jul 2012 15:22:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3ABCA238889B; Mon, 23 Jul 2012 15:21:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1364677 - in /httpd/httpd/branches/2.4.x: ./ modules/cache/cache_util.c Date: Mon, 23 Jul 2012 15:21:53 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120723152153.3ABCA238889B@eris.apache.org> Author: jorton Date: Mon Jul 23 15:21:52 2012 New Revision: 1364677 URL: http://svn.apache.org/viewvc?rev=1364677&view=rev Log: Merge r1352534 from trunk: * modules/cache/cache_util.c (write_write_order): Remove redundant double assignment, caught by Coverity. No functional change. Reviewed by: rjung, humbedooh, jorton Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/modules/cache/cache_util.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ Merged /httpd/httpd/trunk:r1352534 Modified: httpd/httpd/branches/2.4.x/modules/cache/cache_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/cache_util.c?rev=1364677&r1=1364676&r2=1364677&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/cache/cache_util.c (original) +++ httpd/httpd/branches/2.4.x/modules/cache/cache_util.c Mon Jul 23 15:21:52 2012 @@ -172,7 +172,7 @@ cache_provider_list *cache_get_providers cache_server_conf *conf, apr_uri_t uri) { - cache_dir_conf *dconf = dconf = ap_get_module_config(r->per_dir_config, &cache_module); + cache_dir_conf *dconf = ap_get_module_config(r->per_dir_config, &cache_module); cache_provider_list *providers = NULL; int i;