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

SSH2: timeout set in constructor != timeout set by setTimeout()

Browse Source
This commit is contained in:
terrafrost 2014-04-07 00:02:03 -05:00
parent fc748346fc
commit f27a49299e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpseclib/Net/SSH2.php
View File

@ -801,6 +801,17 @@ class Net_SSH2
*/ */
var $port; var $port;
/**
* Timeout for Constructor
*
* For historical BC purposes setTimeout() does not effect timeout of constructor
*
* @see Net_SSH2::login()
* @var Integer
* @access private
*/
var $constructorTimeout
/** /**
* Default Constructor. * Default Constructor.
* *
@ -899,7 +910,7 @@ class Net_SSH2
$this->host = $host; $this->host = $host;
$this->port = $port; $this->port = $port;
$this->timeout = $timeout; $this->constructorTimeout = $timeout;
} }
/** /**
@ -910,7 +921,7 @@ class Net_SSH2
*/ */
function _connect() function _connect()
{ {
$timeout = $this->timeout; $timeout = $this->constructorTimeout;
$this->last_packet = strtok(microtime(), ' ') + strtok(''); // == microtime(true) in PHP5 $this->last_packet = strtok(microtime(), ' ') + strtok(''); // == microtime(true) in PHP5