You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/04 03:35:26 UTC
svn commit: r1153722 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_neon/util.c
Author: hwright
Date: Thu Aug 4 01:35:26 2011
New Revision: 1153722
URL: http://svn.apache.org/viewvc?rev=1153722&view=rev
Log:
Merge r1152726 from trunk:
* r1152726
Make sure repository root URLs in ra_neon are canonical.
Justification:
A repository root at / can cause ra_neon to assert.
Votes:
+1: philip, cmpilato, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 4 01:35:26 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1153416
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152726,1153416
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1153722&r1=1153721&r2=1153722&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 4 01:35:26 2011
@@ -219,10 +219,3 @@ Approved changes:
this revision depends for a clean merge).
Votes:
+1: rhuijben, danielsh, cmpilato
-
- * r1152726
- Make sure repository root URLs in ra_neon are canonical.
- Justification:
- A repository root at / can cause ra_neon to assert.
- Votes:
- +1: philip, cmpilato, rhuijben
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c?rev=1153722&r1=1153721&r2=1153722&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c Thu Aug 4 01:35:26 2011
@@ -1589,8 +1589,9 @@ svn_ra_neon__uri_unparse(const ne_uri *u
/* Unparse uri. */
unparsed_uri = ne_uri_unparse(uri);
- /* Copy string to result pool. */
- result = apr_pstrdup(pool, unparsed_uri);
+ /* Copy string to result pool, and make sure it conforms to
+ Subversion rules */
+ result = svn_uri_canonicalize(unparsed_uri, pool);
/* Free neon's allocated copy. */
ne_free(unparsed_uri);