0
@@ -1,3 +1,7 @@
0
+*SVN*
0
+
0
+* Fix connection problems when using gateways [Ezra Zygmuntowicz]
0
+
0
 *1.3.0* (December 23, 2006)
0
 
0
 * Deprecate rake integration in favor of invoking `cap' directly [Jamis Buck]

0
@@ -21,16 +21,14 @@ module Capistrano
0
     def self.connect(server, config, port=22, &block)
0
       methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
0
       password_value = nil
0
+      
0
+      user, server_stripped, pport = parse_server(server)       
0
 
0
       begin
0
-        ssh_options = { :username => config.user,
0
+        ssh_options = { :username => (user || config.user),
0
                         :password => password_value,
0
-                        :port => port,
0
+                        :port => ((pport && pport != port) ? pport : port),
0
                         :auth_methods => methods.shift }.merge(config.ssh_options)
0
-                        
0
-        user, server_stripped, port = parse_server(server)         
0
-        ssh_options[:username] = user if user   
0
-        ssh_options[:port] = port if port
0
         
0
         Net::SSH.start(server_stripped,ssh_options,&block)
0
       rescue Net::SSH::AuthenticationFailed
0
@@ -40,7 +38,7 @@ module Capistrano
0
       end
0
     end
0
     
0
-    # This regex is used for its byproducts, the $1-9 match vars.
0
+    # This regex is used for its byproducts, the $1-3 match vars.
0
     # This regex will always match the ssh hostname and if there 
0
     # is a username or port they will be matched as well. This 
0
     # allows us to set the username and ssh port right in the