Merge branch '1.0' into 2.0

* 1.0:
  fix order of user_error() and bitmap reset
This commit is contained in:
Andreas Fischer 2018-11-11 16:23:26 +01:00
commit 54fb42ee3b

View File

@ -3936,8 +3936,8 @@ class SSH2
function _send_binary_packet($data, $logged = null)
{
if (!is_resource($this->fsock) || feof($this->fsock)) {
user_error('Connection closed prematurely');
$this->bitmap = 0;
user_error('Connection closed prematurely');
return false;
}