Author: julianfoad
Date: Thu Jan 24 11:49:52 2019
New Revision: 1852016
URL: http://svn.apache.org/viewvc?rev=1852016&view=rev
Log:
* CHANGES: Catch-up merge from trunk.
Modified:
subversion/branches/1.10.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.10.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1852016&r1=1852015&r2=1852016&view=diff
==============================================================================
--- subversion/branches/1.10.x/CHANGES (original)
+++ subversion/branches/1.10.x/CHANGES Thu Jan 24 11:49:52 2019
@@ -15,6 +15,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.10.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 24 11:49:52 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:1817773-1850358
+/subversion/trunk/CHANGES:1817773-1852014
