octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0-stream-set-timeout' into 2.0

Browse Source
This commit is contained in:
terrafrost 2024-02-07 20:14:25 -06:00
commit bcc04abb94
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpseclib/Net/SSH2.php
View File

@ -1108,6 +1108,8 @@ class SSH2
* Default Constructor. * Default Constructor.
* *
* $host can either be a string, representing the host, or a stream resource. * $host can either be a string, representing the host, or a stream resource.
* If $host is a stream resource then $port doesn't do anything, altho $timeout
* still will be used
* *
* @param mixed $host * @param mixed $host
* @param int $port * @param int $port
@ -1198,6 +1200,8 @@ class SSH2
31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY')
); );
$this->timeout = $timeout;
if (is_resource($host)) { if (is_resource($host)) {
$this->fsock = $host; $this->fsock = $host;
return; return;
@ -1206,7 +1210,6 @@ class SSH2
if (is_string($host)) { if (is_string($host)) {
$this->host = $host; $this->host = $host;
$this->port = $port; $this->port = $port;
$this->timeout = $timeout;
} }
} }