From commits-return-50333-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Thu Jan 24 12:49:58 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 707F518062C for ; Thu, 24 Jan 2019 12:49:58 +0100 (CET) Received: (qmail 85104 invoked by uid 500); 24 Jan 2019 11:49:57 -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 85093 invoked by uid 99); 24 Jan 2019 11:49:57 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2019 11:49:57 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1FE583A008F for ; Thu, 24 Jan 2019 11:49:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1852017 - /subversion/branches/1.11.x/CHANGES Date: Thu, 24 Jan 2019 11:49:57 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190124114957.1FE583A008F@svn01-us-west.apache.org> Author: julianfoad Date: Thu Jan 24 11:49:56 2019 New Revision: 1852017 URL: http://svn.apache.org/viewvc?rev=1852017&view=rev Log: * CHANGES: Catch-up merge from trunk. Modified: subversion/branches/1.11.x/CHANGES (contents, props changed) Modified: subversion/branches/1.11.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/CHANGES?rev=1852017&r1=1852016&r2=1852017&view=diff ============================================================================== --- subversion/branches/1.11.x/CHANGES (original) +++ subversion/branches/1.11.x/CHANGES Thu Jan 24 11:49:56 2019 @@ -23,6 +23,7 @@ http://svn.apache.org/repos/asf/subversi * Fix: tree conflict message ends a sentence with a colon (#4717) - Server-side bugfixes: + * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) * Fix crash in mod_http2 (#4782) @@ -108,6 +109,7 @@ http://svn.apache.org/repos/asf/subversi * Fix: tree conflict message ends a sentence with a colon (#4717) - Server-side bugfixes: + * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791) * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882) * Fix crash in mod_http2 (#4782) Propchange: subversion/branches/1.11.x/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 24 11:49:56 2019 @@ -100,4 +100,4 @@ /subversion/branches/verify-at-commit/CHANGES:1462039-1462408 /subversion/branches/verify-keep-going/CHANGES:1439280-1546110 /subversion/branches/wc-collate-path/CHANGES:1402685-1480384 -/subversion/trunk/CHANGES:1840792-1850358 +/subversion/trunk/CHANGES:1840792-1852014