Merge branch '3.0'

This commit is contained in:
terrafrost 2020-08-09 11:01:08 -05:00
commit c4a7e40ebe

View File

@ -2858,6 +2858,10 @@ class SFTP extends SSH2
*/
private function send_sftp_packet($type, $data, $request_id = 1)
{
// in SSH2.php the timeout is cumulative per function call. eg. exec() will
// timeout after 10s. but for SFTP.php it's cumulative per packet
$this->curTimeout = $this->timeout;
$packet = $this->use_request_id ?
pack('NCNa*', strlen($data) + 5, $type, $request_id, $data) :
pack('NCa*', strlen($data) + 1, $type, $data);