Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA02610DE8 for ; Thu, 26 Dec 2013 19:20:39 +0000 (UTC) Received: (qmail 93111 invoked by uid 500); 26 Dec 2013 19:20:39 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 93087 invoked by uid 500); 26 Dec 2013 19:20:39 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 93080 invoked by uid 99); 26 Dec 2013 19:20:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Dec 2013 19:20: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; Thu, 26 Dec 2013 19:20:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 50DCF238890D; Thu, 26 Dec 2013 19:20:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1553556 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c Date: Thu, 26 Dec 2013 19:20:16 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131226192016.50DCF238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Thu Dec 26 19:20:15 2013 New Revision: 1553556 URL: http://svn.apache.org/r1553556 Log: Fix path filter for the 'If' header processing in libsvn_ra_serf. * subversion/libsvn_ra_serf/commit.c (setup_if_header_recursive): Following up on r1553552, fix bad example of argument<->variable shadowing introduced by a refactoring before committing. Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1553556&r1=1553555&r2=1553556&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original) +++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Thu Dec 26 19:20:15 2013 @@ -1083,7 +1083,7 @@ static svn_error_t * setup_if_header_recursive(svn_boolean_t *added, serf_bucket_t *headers, commit_context_t *commit_ctx, - const char *relpath, + const char *rq_relpath, apr_pool_t *pool) { svn_stringbuf_t *sb = NULL; @@ -1108,7 +1108,7 @@ setup_if_header_recursive(svn_boolean_t const char *relpath = svn__apr_hash_index_key(hi); apr_uri_t uri; - if (!svn_relpath_skip_ancestor(relpath, relpath)) + if (!svn_relpath_skip_ancestor(rq_relpath, relpath)) continue; else if (svn_hash_gets(commit_ctx->deleted_entries, relpath)) {