Merge branch '2.0'

This commit is contained in:
terrafrost 2016-08-28 23:17:11 -05:00
commit 6f22a957c2

View File

@ -1916,7 +1916,7 @@ class SFTP extends SSH2
}
} else {
$temp = isset($fp) ? fread($fp, $sftp_packet_size) : substr($data, $sent, $sftp_packet_size);
if ($temp === false) {
if ($temp === false || $temp === '') {
break;
}
}