svn commit: r1399996 - in /subversion/branches/1.6.x-r1387226: ./ subversion/mod_dav_svn/repos.c

[st...@apache.org]

Author: stsp
Date: Fri Oct 19 08:40:48 2012
New Revision: 1399996

URL: http://svn.apache.org/viewvc?rev=1399996&view=rev
Log:
On the 1.6.x-r1387226 branch, merge r1387226 from trunk, resolving a trivial
conflict which occurred because a cast added in r1003986 is missing in 1.6.x.

Modified:
    subversion/branches/1.6.x-r1387226/   (props changed)
    subversion/branches/1.6.x-r1387226/subversion/mod_dav_svn/repos.c

Propchange: subversion/branches/1.6.x-r1387226/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1387226

Modified: subversion/branches/1.6.x-r1387226/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-r1387226/subversion/mod_dav_svn/repos.c?rev=1399996&r1=1399995&r2=1399996&view=diff
==============================================================================
--- subversion/branches/1.6.x-r1387226/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.6.x-r1387226/subversion/mod_dav_svn/repos.c Fri Oct 19 08:40:48 2012
@@ -885,8 +885,11 @@ create_private_resource(const dav_resour
   comb->res.collection = TRUE;                  /* ### always true? */
   /* versioned = baselined = working = FALSE */
 
-  comb->res.uri = apr_pstrcat(base->pool, base->info->repos->root_path,
-                              path->data, NULL);
+  if (base->info->repos->root_path[1])
+    comb->res.uri = apr_pstrcat(base->pool, base->info->repos->root_path,
+                                path->data, NULL);
+  else
+    comb->res.uri = path->data;
   comb->res.info = &comb->priv;
   comb->res.hooks = &dav_svn__hooks_repository;
   comb->res.pool = base->pool;
@@ -1593,9 +1596,11 @@ parse_querystring(request_rec *r, const 
          only use a temporary redirect. */
       apr_table_setn(r->headers_out, "Location",
                      ap_construct_url(r->pool,
-                                      apr_psprintf(r->pool, "%s%s?p=%ld",
-                                                   comb->priv.repos->root_path,
-                                                   newpath, working_rev),
+                                  apr_psprintf(r->pool, "%s%s?p=%ld",
+                                               (comb->priv.repos->root_path[1]
+                                                ? comb->priv.repos->root_path
+                                                : ""),
+                                               newpath, working_rev),
                                       r));
       return dav_new_error(r->pool,
                            prevstr ? HTTP_MOVED_PERMANENTLY
@@ -3938,8 +3943,11 @@ dav_svn__create_working_resource(dav_res
   res->baselined = base->baselined;
   /* collection = FALSE.   ### not necessarily correct */
 
-  res->uri = apr_pstrcat(base->pool, base->info->repos->root_path,
-                         path, NULL);
+  if (base->info->repos->root_path[1])
+    res->uri = apr_pstrcat(base->pool, base->info->repos->root_path,
+                           path, NULL);
+  else
+    res->uri = path;
   res->hooks = &dav_svn__hooks_repository;
   res->pool = base->pool;