Author: stsp
Date: Mon Sep 10 13:18:15 2012
New Revision: 1382821
URL: http://svn.apache.org/viewvc?rev=1382821&view=rev
Log:
Merge r1088602 from trunk, resolving tree-conflict on dav-mirror-autocheck.sh.
* r1088602
Fix regression introduced in r1104127. That revision introduced a bug where
a URI may end up being double-encoded, breaking commits via write-through
proxies in certain circumstances.
Justification:
This regression has been fixed in 1.7.x and trunk but not in 1.6.x.
It first appeared in Subversion-1.6.17.
Evidence of this bug has been reported privately by an elego customer
who also provided a reproduction recipe based on private data which
won't be disclosed.
Notes:
To avoid a tree-conflict run a subtree merge to mod_dav_svn/mirror.c.
The revision also edited the dav-mirror-autocheck.sh script which
does not exist in 1.6.
Votes:
+1: stsp, philip, cmpilato
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1088602
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1382821&r1=1382820&r2=1382821&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Sep 10 13:18:15 2012
@@ -64,23 +64,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1088602
- Fix regression introduced in r1104127. That revision introduced a bug where
- a URI may end up being double-encoded, breaking commits via write-through
- proxies in certain circumstances.
- Justification:
- This regression has been fixed in 1.7.x and trunk but not in 1.6.x.
- It first appeared in Subversion-1.6.17.
- Evidence of this bug has been reported privately by an elego customer
- who also provided a reproduction recipe based on private data which
- won't be disclosed.
- Notes:
- To avoid a tree-conflict run a subtree merge to mod_dav_svn/mirror.c.
- The revision also edited the dav-mirror-autocheck.sh script which
- does not exist in 1.6.
- Votes:
- +1: stsp, philip, cmpilato
-
* r1338810, r1339164, r1339154
Fix issue #4184 ("partial svnsync drops properties when converting
copies to adds").
Modified: subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c?rev=1382821&r1=1382820&r2=1382821&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c Mon Sep 10
13:18:15 2012
@@ -224,7 +224,6 @@ apr_status_t dav_svn__location_header_fi
dav_svn__get_root_dir(r),
start_foo, NULL),
r);
- new_uri = svn_path_uri_encode(new_uri, r->pool);
apr_table_set(r->headers_out, "Location", new_uri);
}
return ap_pass_brigade(f->next, bb);
