Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2020-10-31 15:15:06 -05:00
commit e18880009b

View File

@ -2248,9 +2248,6 @@ class SFTP extends SSH2
} }
$packet = null; $packet = null;
$read+= $packet_size; $read+= $packet_size;
if (is_callable($progressCallback)) {
call_user_func($progressCallback, $read);
}
$i++; $i++;
} }
@ -2280,6 +2277,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: