Author: stsp
Date: Fri Jun 3 11:20:27 2011
New Revision: 1130990
URL: http://svn.apache.org/viewvc?rev=1130990&view=rev
Log:
* CHANGES (for 1.6.x): Merge all edits not related to the 1.7.0 section
from the CHANGES file on trunk.
Modified:
subversion/branches/1.6.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.6.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/CHANGES?rev=1130990&r1=1130989&r2=1130990&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Fri Jun 3 11:20:27 2011
@@ -78,8 +78,10 @@ http://svn.apache.org/repos/asf/subversi
* fix 'svn export' regression from 1.6.13 (r1032970)
* fix 'svn export' mistakenly uri-encodes paths (issue #3745)
* fix server-side memory leaks triggered by 'blame -g' (r1032808)
+ This has been tracked as CVE-2010-4644
* prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
- * allow 'log -g' to continue in the face of invalid mergeinfo (r1028108)
+ This has been tracked as CVE-2010-4539
+ * allow 'log -g' to continue in the face of invalid mergeinfo (issue #3270)
* filter unreadable paths for 'svn ls' and 'svn co' (r997026, -070, -474)
* fix abort in 'svn blame -g' (issue #3666)
* fix file handle leak in ruby bindings (issue #3512)
@@ -512,9 +514,9 @@ http://svn.apache.org/repos/asf/subversi
* fix building Ruby bindings with Ruby 1.9 (r35852, r35883)
-Version 1.5.8
-(?? ??? 2010, from /branches/1.5.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.5.8
+Version 1.5.9
+(06 Dec 2010, from /branches/1.5.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.5.9
User-visible changes:
* fix proxying of LOCK and UNLOCK requests with WebDAV proxies (r36159)
@@ -524,13 +526,21 @@ http://svn.apache.org/repos/asf/subversi
* fixed: repeated mergeinfo of conflicting properties fails (issue #3250)
* fix segfault in wc->URL copy (r37646, -56)
* make 'svn up --set-depth infinity' expand shallow subtrees (r37169)
+ * resolve symlinks when checking for ~/.subversion (r36023)
* make default depth of 'svn merge' infinity (r37156)
+ * don't allow foreign merges to add foreign mergeinfo (issue #3383)
* error if attempting to reintegrate to/from the repo root (r37385)
+ * let 'svnadmin load' tolerate mergeinfo with "\r\n" (r37768)
* improve memory performance in 'svn merge' (issue #3393)
* fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
See CVE-2010-3315, and descriptive advisory at
http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
* prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
+ * limit memory fragmentation in svnserve (r1022675)
+ * fix server-side memory leaks triggered by 'blame -g' (r1032808)
+ * perform MIME type matching case-insensitively (issue #3479)
+ * respect Apache's ServerSignature directive (r880082)
+ * error early if attempting to use Serf >= 0.4.0 (r1041545)
Developer-visible changes:
* fix pointer dereference (r36783)
@@ -538,6 +548,10 @@ http://svn.apache.org/repos/asf/subversi
* make basic_tests 12 compatible with Windows and Python 2.5+ (r35930)
+Version 1.5.8
+(Not released, see changes for 1.5.9.)
+
+
Version 1.5.7
(06 Aug 2009, from /branches/1.5.x)
http://svn.apache.org/repos/asf/subversion/tags/1.5.7
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 11:20:27 2011
@@ -21,14 +21,19 @@
/subversion/branches/1.6.x-issue3641/CHANGES:1072041-1125381
/subversion/branches/1.6.x-issue3646/CHANGES:957327-1002699
/subversion/branches/1.6.x-issue3648/CHANGES:964172-1001805
+/subversion/branches/1.6.x-issue3650/CHANGES:1095508-1125384
/subversion/branches/1.6.x-issue3651/CHANGES:952977-954985
/subversion/branches/1.6.x-issue3654/CHANGES:953882-955338
/subversion/branches/1.6.x-issue3683/CHANGES:965785-988062
/subversion/branches/1.6.x-issue3700/CHANGES:991967-997279
+/subversion/branches/1.6.x-issue3719/CHANGES:1075930-1096984
/subversion/branches/1.6.x-issue3727/CHANGES:1032967-1033213
/subversion/branches/1.6.x-issue3745/CHANGES:1032257-1033223
/subversion/branches/1.6.x-issue3816/CHANGES:1083880-1104106
+/subversion/branches/1.6.x-issue3843/CHANGES:1084999-1104104
/subversion/branches/1.6.x-issue3845/CHANGES:1086922-1104099
+/subversion/branches/1.6.x-issue3853/CHANGES:1091877-1103782
+/subversion/branches/1.6.x-neon-expat/CHANGES:1127177-1127947
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
/subversion/branches/1.6.x-no-wcng-check/CHANGES:1022248-1035322
/subversion/branches/1.6.x-r1002094/CHANGES:1002741-1002773
@@ -38,6 +43,7 @@
/subversion/branches/1.6.x-r1058269/CHANGES:1058271-1072344
/subversion/branches/1.6.x-r1068988/CHANGES:1070588-1072337
/subversion/branches/1.6.x-r1072084/CHANGES:1072274-1100234
+/subversion/branches/1.6.x-r1104309/CHANGES:1104318-1124170
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
/subversion/branches/1.6.x-r37622/CHANGES:877699-877993
@@ -67,6 +73,7 @@
/subversion/branches/1.6.x-r898963/CHANGES:899874-915098
/subversion/branches/1.6.x-r905326/CHANGES:905545-923537
/subversion/branches/1.6.x-r907644/CHANGES:1033292-1033692
+/subversion/branches/1.6.x-r917523/CHANGES:1035989-1104126
/subversion/branches/1.6.x-r923389/CHANGES:927445-929628
/subversion/branches/1.6.x-r926151/CHANGES:927922-929631
/subversion/branches/1.6.x-r933299/CHANGES:933310-934492
@@ -88,6 +95,7 @@
/subversion/branches/fs-rep-sharing/CHANGES:869036-873803
/subversion/branches/fsfs-pack/CHANGES:873717-874575
/subversion/branches/gnome-keyring/CHANGES:870558-871410
+/subversion/branches/http-protocol-v2/CHANGES:875632
/subversion/branches/in-memory-cache/CHANGES:869829-871452
/subversion/branches/issue-2843-dev/CHANGES:871432-874179
/subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
@@ -99,6 +107,7 @@
/subversion/branches/kwallet/CHANGES:870785-871314
/subversion/branches/log-g-performance/CHANGES:870941-871032
/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
+/subversion/branches/performance/CHANGES:982355,983766,984927
/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
/subversion/branches/subtree-mergeinfo/CHANGES:876855
/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
@@ -110,4 +119,4 @@
/subversion/branches/tc_url_rev/CHANGES:874351-874483
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-1038588,1038792,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058722,1063572-1063573,1063592,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1086222,1101124-1126744,1126810,1130448
+/subversion/trunk/CHANGES:875962-1130989
