octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

SFTP_Stream: Cache didn't work correctly

Browse Source
This commit is contained in:
terrafrost 2013-03-13 23:30:52 -05:00
parent 3153daf548
commit 95f40d9c8f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpseclib/Net/SFTP/Stream.php
View File

@ -138,6 +138,7 @@ class Net_SFTP_Stream {
function _parse_path($path)
{
extract(parse_url($path));
if (!isset($host)) {
return false;
}
@ -175,14 +176,16 @@ class Net_SFTP_Stream {
return false;
}
if (isset($this->instances[$host][$port][$user][$pass])) {
$this->sftp = $this->instances[$host][$port][$user][$pass];
// casting $pass to a string is necessary in the event that it's a Crypt_RSA object
if (isset(self::$instances[$host][$port][$user][(string) $pass])) {
$this->sftp = self::$instances[$host][$port][$user][(string) $pass];
} else {
$this->sftp = new Net_SFTP($host, isset($port) ? $port : 22);
if (!$this->sftp->login($user, $pass)) {
return false;
}
self::$instances[$host][$port][$user][(string) $pass] = $this->sftp;
}
$this->sftp = new Net_SFTP($host, isset($port) ? $port : 22);
if (!$this->sftp->login($user, $pass)) {
return false;
}
$this->instances[$host][$port][$user][$pass] = $this->sftp;
}
return $path;