Author: pburba
Date: Mon May 16 21:29:52 2011
New Revision: 1103906
URL: http://svn.apache.org/viewvc?rev=1103906&view=rev
Log:
* STATUS: Vote and approve r878590, veto (temporarily I hope) r916286.
Modified:
subversion/branches/1.6.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1103906&r1=1103905&r2=1103906&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon May 16 21:29:52 2011
@@ -31,58 +31,6 @@ Candidate changes:
works correctly. I think the not interactive code path
needs the same fix).
- * r878590, r878607, r878625, r878626, r878627
- In trunk we optimized the common case of 'find-and-replace with same uri'
- of proxied content thanks to issue 3445 "WebDAV proxy code munging user
- data".
- r878590 is just a change that adds FIXME marker to code comment. We take it
- to avoid spurious conflicts with other revisions.
- r878607 Special cases no-op find and replace.
- "r878625, r878626, r878627" are follow-up to r878607 and the other long
- pending Master info leak to the clients.
- Justification:
- 1. This group has the most common 'optimization' fix of *not* groking the
- proxied response to find and replace with same string.
- 2. Fixes the master information leak via the Location header.
- 3. Need this to be ported for the other defect to be ported
- without conflict.
- Votes:
- +1: kameshj, cmpilato
- -0: julianfoad (seem to be multiple changes here for different reasons -
- at least issue '3445 and an optimization and an information leak;
- r878607 log msg says it fixes bugs but it's not clear what bugs;
- don't know how to tell whether justification 1 is significant;
- justifications don't seem to refer to issue #3445. Please can we
- separate these changes and clearly describe each one? And update
- the r878607 log msg.)
-
- * r916286, r917512
- Fixes failing commmits (with vague error messages) seen on client
- side for WebDAV proxy configurations such as the following (note
- the trailing slash at the end of '/svn/'):
-
- <Location /svn/>
- DAV svn
- SVNParentPath /repositories
- # Trailing slash on the master URI also can cause the confusion.
- SVNMasterURI http://master/svn/
- SVNAdvertiseV2Protocol Off
- </Location>
-
- Error message shows up like so:
-
- svn: Commit failed (details follow):
- svn: MKACTIVITY of '/svn/demujin/!svn/act/4b6d547c-018d-4e02-9d3f-2b28\
- 3076cc06': Could not read status line: connection was closed by server\
- (http://localhost)
-
- Notes:
- Depends on the r878590 group for a conflict-free backport.
- Justification:
- Fixes failed commits.
- Votes:
- +1: kameshj
-
* r917523
If the configured slave url employes URI-unsafe characters
(<space>, '?', '%'), proxying of commits fails and commit affects
@@ -347,6 +295,40 @@ Veto-blocked changes:
and r1002151, so trunk code only relies on getenv("WINDOWID").
I would +1 a backport that also merges these revisions).
+ * r916286, r917512
+ Fixes failing commmits (with vague error messages) seen on client
+ side for WebDAV proxy configurations such as the following (note
+ the trailing slash at the end of '/svn/'):
+
+ <Location /svn/>
+ DAV svn
+ SVNParentPath /repositories
+ # Trailing slash on the master URI also can cause the confusion.
+ SVNMasterURI http://master/svn/
+ SVNAdvertiseV2Protocol Off
+ </Location>
+
+ Error message shows up like so:
+
+ svn: Commit failed (details follow):
+ svn: MKACTIVITY of '/svn/demujin/!svn/act/4b6d547c-018d-4e02-9d3f-2b28\
+ 3076cc06': Could not read status line: connection was closed by server\
+ (http://localhost)
+
+ Notes:
+ Depends on the r878590 group for a conflict-free backport.
+ Justification:
+ Fixes failed commits.
+ Votes:
+ +1: kameshj
+ -1: pburba (the net change of r916286 and r917512 relies on the 1.7 API
+ svn_uri_canonicalize. This API does exist in 1.6, but only for
+ testing purposes, see subversion\libsvn_subr\private_uri.h and
+ http://svn.apache.org/viewvc?view=revision&revision=876419
+ All that is *probably* needed is a backport branch which makes
+ use of svn_path_canonicalize instead, but this will have to wait
+ until the r878590 group is backported.)
+
* r921453, r927184, r927243
Fix reopened issue #3020 'Reflect dropped/renumbered revisions in
svn:mergeinfo data during svnadmin load'
@@ -396,6 +378,31 @@ Veto-blocked changes:
Approved changes:
=================
+ * r878590, r878607, r878625, r878626, r878627
+ In trunk we optimized the common case of 'find-and-replace with same uri'
+ of proxied content thanks to issue 3445 "WebDAV proxy code munging user
+ data".
+ r878590 is just a change that adds FIXME marker to code comment. We take it
+ to avoid spurious conflicts with other revisions.
+ r878607 Special cases no-op find and replace.
+ "r878625, r878626, r878627" are follow-up to r878607 and the other long
+ pending Master info leak to the clients.
+ Justification:
+ 1. This group has the most common 'optimization' fix of *not* groking the
+ proxied response to find and replace with same string.
+ 2. Fixes the master information leak via the Location header.
+ 3. Need this to be ported for the other defect to be ported
+ without conflict.
+ Votes:
+ +1: kameshj, cmpilato, pburba
+ -0: julianfoad (seem to be multiple changes here for different reasons -
+ at least issue '3445 and an optimization and an information leak;
+ r878607 log msg says it fixes bugs but it's not clear what bugs;
+ don't know how to tell whether justification 1 is significant;
+ justifications don't seem to refer to issue #3445. Please can we
+ separate these changes and clearly describe each one? And update
+ the r878607 log msg.)
+
* r1036429
Fix svnsync_tests 29 for BDB.
Justification:
