danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2025-01-21 21:41:14 +01:00
Code Issues Projects Releases Wiki Activity

Workaround for buggy stream_select's

Browse Source 
Workaround for this issue:

https://bugs.php.net/bug.php?id=42682

Thanks solefald!
This commit is contained in:
terrafrost 2012-08-29 17:55:22 -05:00
parent e2ae5100c2
commit 5de5d45bd5
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

@ -801,7 +801,7 @@ class Net_SSH2 {
stream_set_blocking($this->fsock, false); stream_set_blocking($this->fsock, false);
// on windows this returns a "Warning: Invalid CRT parameters detected" error // on windows this returns a "Warning: Invalid CRT parameters detected" error
if (!@stream_select($read, $write, $except, $timeout - $elapsed)) { if (!@stream_select($read, $write, $except, $timeout - $elapsed) && !count($read)) {
user_error(rtrim("Cannot connect to $host. Banner timeout"), E_USER_NOTICE); user_error(rtrim("Cannot connect to $host. Banner timeout"), E_USER_NOTICE);
return; return;
} }
@ -2183,7 +2183,7 @@ class Net_SSH2 {
$start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838 $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
// on windows this returns a "Warning: Invalid CRT parameters detected" error // on windows this returns a "Warning: Invalid CRT parameters detected" error
if (!@stream_select($read, $write, $except, $this->curTimeout)) { if (!@stream_select($read, $write, $except, $this->curTimeout) && !count($read)) {
stream_set_blocking($this->fsock, true); stream_set_blocking($this->fsock, true);
$this->_close_channel($client_channel); $this->_close_channel($client_channel);
return true; return true;