Author: philip
Date: Thu Jan 26 13:49:04 2012
New Revision: 1236173
URL: http://svn.apache.org/viewvc?rev=1236173&view=rev
Log:
Fix a 1.6 client to 1.7 server compatibility problem. 1.7 has
stricter URL canonicaliztion rules that caused mod_dav_svn to
reject some 1.6 requests.
* subversion/mod_dav_svn/reports/update.c
(dav_svn__update_report): Canonicalize the incoming src-path and
dst-path URLs instead of requiring canonical data from the client.
Modified:
subversion/trunk/subversion/mod_dav_svn/reports/update.c
Modified: subversion/trunk/subversion/mod_dav_svn/reports/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/update.c?rev=1236173&r1=1236172&r2=1236173&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Thu Jan 26
13:49:04 2012
@@ -955,8 +955,8 @@ dav_svn__update_report(const dav_resourc
cdata = dav_xml_get_cdata(child, resource->pool, 0);
if (! *cdata)
return malformed_element_error(child->name, resource->pool);
- if ((derr = dav_svn__test_canonical(cdata, resource->pool)))
- return derr;
+ if (svn_path_is_url(cdata))
+ cdata = svn_uri_canonicalize(cdata, resource->pool);
if ((serr = dav_svn__simple_parse_uri(&this_info, resource,
cdata, resource->pool)))
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
@@ -970,8 +970,8 @@ dav_svn__update_report(const dav_resourc
cdata = dav_xml_get_cdata(child, resource->pool, 0);
if (! *cdata)
return malformed_element_error(child->name, resource->pool);
- if ((derr = dav_svn__test_canonical(cdata, resource->pool)))
- return derr;
+ if (svn_path_is_url(cdata))
+ cdata = svn_uri_canonicalize(cdata, resource->pool);
if ((serr = dav_svn__simple_parse_uri(&this_info, resource,
cdata, resource->pool)))
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
