Index: subversion/mod_dav_svn/mirror.c
===================================================================
--- subversion/mod_dav_svn/mirror.c	(revision 910164)
+++ subversion/mod_dav_svn/mirror.c	(working copy)
@@ -64,6 +64,7 @@
 
     if (root_dir && master_uri) {
         const char *seg;
+        size_t root_dir_len = strlen(root_dir);
 
         /* We know we can always safely handle these. */
         if (r->method_number == M_REPORT ||
@@ -85,7 +86,10 @@
                                                     "/txn/", NULL))
                     || ap_strstr_c(seg, apr_pstrcat(r->pool, special_uri,
                                                     "/txr/", NULL))) {
-                    seg += strlen(root_dir);
+                    if (root_dir[root_dir_len - 1] == '/')
+                        seg += (root_dir_len - 1);
+                    else
+                        seg += root_dir_len;
                     proxy_request_fixup(r, master_uri, seg);
                 }
             }
@@ -100,7 +104,10 @@
                     r->method_number == M_LOCK ||
                     r->method_number == M_UNLOCK ||
                     ap_strstr_c(seg, special_uri))) {
-            seg += strlen(root_dir);
+            if (root_dir[root_dir_len - 1] == '/')
+                seg += (root_dir_len - 1);
+            else
+                seg += root_dir_len;
             proxy_request_fixup(r, master_uri, seg);
             return OK;
         }