Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2020-11-01 09:31:17 -06:00
commit 7e337c9bd7

View File

@ -2159,9 +2159,6 @@ class SFTP extends SSH2
} }
$packet = null; $packet = null;
$read+= $packet_size; $read+= $packet_size;
if (is_callable($progressCallback)) {
$progressCallback($read);
}
$i++; $i++;
} }
@ -2191,6 +2188,9 @@ class SFTP extends SSH2
} else { } else {
fputs($fp, $temp); fputs($fp, $temp);
} }
if (is_callable($progressCallback)) {
call_user_func($progressCallback, $offset);
}
$temp = null; $temp = null;
break; break;
case NET_SFTP_STATUS: case NET_SFTP_STATUS: