svn commit: r1200900 - /subversion/branches/1.7.x/CHANGES

[st...@apache.org]

Author: stsp
Date: Fri Nov 11 14:28:58 2011
New Revision: 1200900

URL: http://svn.apache.org/viewvc?rev=1200900&view=rev
Log:
* CHANGES (for 1.7.x): Sync with trunk.

Modified:
    subversion/branches/1.7.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1200900&r1=1200899&r2=1200900&view=diff
==============================================================================
--- subversion/branches/1.7.x/CHANGES (original)
+++ subversion/branches/1.7.x/CHANGES Fri Nov 11 14:28:58 2011
@@ -262,10 +262,10 @@ http://svn.apache.org/repos/asf/subversi
     * fix 'log -g' excessive duplicate output (issue #3650)
     * fix svnsync copyfrom handling bug with BDB (r1036429)
     * server-side validation of svn:mergeinfo syntax during commit (issue #3895)
-    * fix remotely triggerable mod_dav_svn DoS
+    * fix remotely triggerable mod_dav_svn DoS (r1130303)
             See CVE-2011-1783, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1783-advisory.txt
-    * fix potential leak of authz-protected file contents
+    * fix potential leak of authz-protected file contents (r1130303)
             See CVE-2011-1921, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1921-advisory.txt
 

Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 11 14:28:58 2011
@@ -59,4 +59,4 @@
 /subversion/branches/tree-conflicts/CHANGES:868291-873154
 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
 /subversion/branches/uris-as-urls/CHANGES:1060426-1064427
-/subversion/trunk/CHANGES:1145993-1160329,1161063,1161210,1162110-1167354,1176949-1186825,1189190,1189395
+/subversion/trunk/CHANGES:1145993-1200899