mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-27 11:52:48 +00:00
Merge branch '3.0'
This commit is contained in:
commit
b408cec283
@ -1104,9 +1104,9 @@ class SSH2
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined('NET_SSH2_LOGGING')) {
|
if (defined('NET_SSH2_LOGGING')) {
|
||||||
$this->append_log('(fsockopen took ' . round($elapsed, 4) . 's)', '');
|
$this->append_log('(fsockopen took ' . round($elapsed, 4) . 's)', '');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->identifier = $this->generate_identifier();
|
$this->identifier = $this->generate_identifier();
|
||||||
@ -1145,7 +1145,7 @@ class SSH2
|
|||||||
throw new RuntimeException('Connection timed out whilst receiving server identification string');
|
throw new RuntimeException('Connection timed out whilst receiving server identification string');
|
||||||
}
|
}
|
||||||
$elapsed = microtime(true) - $start;
|
$elapsed = microtime(true) - $start;
|
||||||
$totalElapsed+= $elapsed;
|
$totalElapsed += $elapsed;
|
||||||
$this->curTimeout -= $elapsed;
|
$this->curTimeout -= $elapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user