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

[rh...@apache.org]

Author: rhuijben
Date: Wed Jan 29 00:51:16 2014
New Revision: 1562337

URL: http://svn.apache.org/r1562337
Log:
When connecting to an svn+SOMETHING:// ra session, don't store the default port
number directly as that makes it impossible for the tunnel callbacks to see
the difference between an url like svn+ssh://server/something and
svn+ssh://server:3690/something.

* subversion/libsvn_ra_svn/client.c
  (parse_url): Don't apply default port number here...
  (open_session): ... but do it here when opening the socket connection.

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=1562337&r1=1562336&r2=1562337&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Wed Jan 29 00:51:16 2014
@@ -563,9 +563,6 @@ static svn_error_t *parse_url(const char
     return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                              _("Illegal svn repository URL '%s'"), url);
 
-  if (! uri->port)
-    uri->port = SVN_RA_SVN_PORT;
-
   return SVN_NO_ERROR;
 }
 
@@ -673,7 +670,9 @@ static svn_error_t *open_session(svn_ra_
     }
   else
     {
-      SVN_ERR(make_connection(uri->hostname, uri->port, &sock, pool));
+      SVN_ERR(make_connection(uri->hostname,
+                              uri->port ? uri->port : SVN_RA_SVN_PORT,
+                              &sock, pool));
       conn = svn_ra_svn_create_conn4(sock, NULL, NULL,
                                      SVN_DELTA_COMPRESSION_LEVEL_DEFAULT,
                                      0, 0, pool);