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

Merge branch 'master' into php5

Browse Source 
* master:
  SSH2: removed redundant rtrim
This commit is contained in:
Andreas Fischer 2014-09-28 12:43:54 +02:00
commit 92c3127448
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Net/SSH2.php
View File

@ -968,7 +968,7 @@ class Net_SSH2
$timeout-= $elapsed; $timeout-= $elapsed;
if ($timeout <= 0) { if ($timeout <= 0) {
user_error(rtrim("Cannot connect to $host. Timeout error")); user_error("Cannot connect to $host. Timeout error");
return false; return false;
} }
@ -981,7 +981,7 @@ class Net_SSH2
// on windows this returns a "Warning: Invalid CRT parameters detected" error // on windows this returns a "Warning: Invalid CRT parameters detected" error
// the !count() is done as a workaround for <https://bugs.php.net/42682> // the !count() is done as a workaround for <https://bugs.php.net/42682>
if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) { if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
user_error(rtrim("Cannot connect to $host. Banner timeout")); user_error("Cannot connect to $host. Banner timeout");
return false; return false;
} }