svn commit: r1583334 - /subversion/trunk/subversion/libsvn_ra_svn/client.c

[rhuijben]

Author: rhuijben
Date: Mon Mar 31 14:25:04 2014
New Revision: 1583334

URL: http://svn.apache.org/r1583334
Log:
* subversion/libsvn_ra_svn/client.c
  (open_session): Resolve a regression in generating realm strings for svn://
    connections and update the algorithm for svn+XXX:// to add the XXX in the
    realm string.

Found by: julianfoad

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/client.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1583334&r1=1583333&r2=1583334&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Mon Mar 31 14:25:04 2014
@@ -624,8 +624,6 @@ static svn_error_t *open_session(svn_ra_
   sess->url = apr_pstrdup(pool, url);
   sess->user = uri->user;
   sess->hostname = uri->hostname;
-  sess->realm_prefix = apr_psprintf(pool, "<svn://%s:%d>", uri->hostname,
-                                    uri->port);
   sess->tunnel_name = tunnel_name;
   sess->tunnel_argv = tunnel_argv;
   sess->callbacks = callbacks;
@@ -639,6 +637,10 @@ static svn_error_t *open_session(svn_ra_
 
   if (tunnel_name)
     {
+      sess->realm_prefix = apr_psprintf(pool, "<svn+%s://%s:%d>",
+                                        tunnel_name,
+                                        uri->hostname, uri->port);
+
       if (tunnel_argv)
         SVN_ERR(make_tunnel(tunnel_argv, &conn, pool));
       else
@@ -667,6 +669,9 @@ static svn_error_t *open_session(svn_ra_
     }
   else
     {
+      sess->realm_prefix = apr_psprintf(pool, "<svn://%s:%d>", uri->hostname,
+                                        uri->port ? uri->port : 
SVN_RA_SVN_PORT);
+
       SVN_ERR(make_connection(uri->hostname,
                               uri->port ? uri->port : SVN_RA_SVN_PORT,
                               &sock, pool));