You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/11/25 10:18:47 UTC
svn commit: r1771273 - /subversion/branches/1.9.x/CHANGES
Author: stsp
Date: Fri Nov 25 10:18:47 2016
New Revision: 1771273
URL: http://svn.apache.org/viewvc?rev=1771273&view=rev
Log:
On the 1.9.x branch:
* CHANGES: Merge from trunk (due in any case at next release).
Modified:
subversion/branches/1.9.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.9.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/CHANGES?rev=1771273&r1=1771272&r2=1771273&view=diff
==============================================================================
--- subversion/branches/1.9.x/CHANGES (original)
+++ subversion/branches/1.9.x/CHANGES Fri Nov 25 10:18:47 2016
@@ -19,7 +19,7 @@ http://svn.apache.org/repos/asf/subversi
* fsfs: fix "offset too large" error during pack (issue #4657)
* svnserve: enable hook script environments (r1769152)
* fsfs: fix possible data reconstruction error (issue #4658)
- * fix source of spurious 'incoming edit' tree conflicts (r1770108)
+ * fix source of spurious 'incoming edit' tree conflicts (r1760570)
* fsfs: improve caching for large directories (r1721285)
* fsfs: fix crash when encountering all-zero checksums (r1759686)
* fsfs: fix potential source of repository corruptions (r1756266)
@@ -34,19 +34,19 @@ http://svn.apache.org/repos/asf/subversi
- Bindings bugfixes:
* swig-pl: do not corrupt "{DATE}" revision variable (r1767768)
- * javahl: fix temporary accepting SSL server certificates (r1764851)
+ * javahl: fix temporarily accepting SSL server certificates (r1764851)
* swig-pl: fix possible stack corruption (r1683266, r1683267)
Developer-visible changes:
- General:
* add zlib discovery through pkg-config (issue #4655)
* fix potential build issue with invalid SVN_LOCALE_DIR (issue #4653)
- * ruby: fix test failures with ruby >= 2.2 (r1766621)
- * fix link error with --disable-keychain on OS X (r1765385)
+ * ruby: fix test failures with ruby >= 2.2 (r1766240)
+ * fix link error with --disable-keychain on OS X (r1761755)
* swig: enable building with SWIG >= 3.0.6 (r1721488 et al)
* swig: fix building with -Wdate-time in $CPPFLAGS (r1722164)
* update serf download URI in build scripts (r1700130 et al)
- * raise minimal httpd version from 2.0 to 2.2 (r1754193)
+ * raise minimal httpd version from 2.0 to 2.2 (r1754190)
Version 1.9.4
@@ -105,7 +105,6 @@ http://svn.apache.org/repos/asf/subversi
* svn: report lock/unlock errors as failures (r1701598 et al)
* svn: cleanup user deleted external registrations (r1705843, r1710558)
* svn: allow simple resolving of binary file text conflicts (r1703581)
- * svnlook: properly remove tempfiles on diff errors (r1711346)
* ra_serf: report built- and run-time versions of libserf (r1704847)
* ra_serf: set Content-Type header in outgoing requests (r1715224 et al)
* svn: fix merging deletes of svn:eol-style CRLF/CR files (r1703689 et al)
@@ -118,6 +117,7 @@ http://svn.apache.org/repos/asf/subversi
* mod_dav_svn: use LimitXMLRequestBody for skel-encoded requests (r1687812)
* svnadmin dump: preserve no-op changes (r1709388 et al, issue #4598)
* fsfs: avoid unneeded I/O when opening transactions (r1715793)
+ * svnlook: properly remove tempfiles on diff errors (r1711346)
- Client-side and server-side bugfixes:
* fix heap overflow in svn:// protocol parser (CVE-2015-5259)
@@ -942,12 +942,12 @@ http://svn.apache.org/repos/asf/subversi
- Client-side bugfixes:
* fix handling of newly secured subdirectories in working copy (r1724448)
* ra_serf: fix deleting directories with many files (issue #4557)
- * svnlook: properly remove tempfiles on diff errors (r1711346)
* gpg-agent: properly handle passwords with percent characters (issue #4611)
* merge: fix crash when merging to a local add (r1702299 et al)
- Server-side bugfixes:
* fsfs: fix possible data reconstruction error (issue #4658)
+ * svnlook: properly remove tempfiles on diff errors (r1711346)
- Client-side and server-side bugfixes:
* fix potential memory access bugs (r1722860 et al)
Propchange: subversion/branches/1.9.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 25 10:18:47 2016
@@ -89,4 +89,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:1660545-1770680
+/subversion/trunk/CHANGES:1660545-1771271