Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2020-07-31 02:50:00 -05:00
commit 4eb477051c

View File

@ -2125,12 +2125,14 @@ class SSH2
// try logging with 'none' as an authentication method first since that's what // try logging with 'none' as an authentication method first since that's what
// PuTTY does // PuTTY does
if (substr($this->server_identifier, 0, 13) != 'SSH-2.0-CoreFTP') {
if ($this->_login($username)) { if ($this->_login($username)) {
return true; return true;
} }
if (count($args) == 1) { if (count($args) == 1) {
return false; return false;
} }
}
return call_user_func_array(array(&$this, '_login'), $args); return call_user_func_array(array(&$this, '_login'), $args);
} }