danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-12 09:09:39 +01:00
Code Issues Projects Releases Wiki Activity

SFTP: Update how resumes work

Browse Source
This commit is contained in:
terrafrost 2013-06-11 12:49:45 -05:00
parent a83ff6cad8
commit cbe156f0cb
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
phpseclib/Net/SFTP.php
View File

@ -1410,19 +1410,33 @@ class Net_SFTP extends Net_SSH2 {
* Currently, only binary mode is supported. As such, if the line endings need to be adjusted, you will need to take * Currently, only binary mode is supported. As such, if the line endings need to be adjusted, you will need to take
* care of that, yourself. * care of that, yourself.
* *
* As for $start... if it's negative (which it is by default) a new file will be created or an existing * $mode can take an additional two parameters - NET_SFTP_RESUME and NET_SFTP_RESUME_START. These are bitwise AND'd with
* file truncated depending on $mode | NET_SFTP_RESUME. If it's zero or positive it'll be updated at that * $mode. So if you want to resume upload of a 300mb file on the local file system you'd set $mode to the following:
* spot. *
* NET_SFTP_LOCAL_FILE | NET_SFTP_RESUME
*
* If you wanted to simply append the full contents of a local file to the full contents of a remote file you'd replace
* NET_SFTP_RESUME with NET_SFTP_RESUME start.
*
* If $mode & (NET_SFTP_RESUME | NET_SFTP_RESUME_START) then NET_SFTP_RESUME_START will be assumed.
*
* $start and $local_start give you more fine grained control over this process and take precident over NET_SFTP_RESUME*
* when they're non-negative. ie. $start could let you write at the end of a file (like NET_SFTP_RESUME) or in the middle
* of one. $local_start could let you start your reading from the end of a file (like NET_SFTP_RESUME_START) or in the
* middle of one.
*
* Setting $local_start to > 0 or $mode | NET_SFTP_RESUME_START doesn't do anything unless $mode | NET_SFTP_LOCAL_FILE.
* *
* @param String $remote_file * @param String $remote_file
* @param String $data * @param String $data
* @param optional Integer $mode * @param optional Integer $mode
* @param optional Integer $start * @param optional Integer $start
* @param optional Integer $local_start
* @return Boolean * @return Boolean
* @access public * @access public
* @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - Net_SFTP::setMode(). * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - Net_SFTP::setMode().
*/ */
function put($remote_file, $data, $mode = NET_SFTP_STRING, $start = -1) function put($remote_file, $data, $mode = NET_SFTP_STRING, $start = -1, $local_start = -1)
{ {
if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) { if (!($this->bitmap & NET_SSH2_MASK_LOGIN)) {
return false; return false;
@ -1438,19 +1452,16 @@ class Net_SFTP extends Net_SSH2 {
// in practice, it doesn't seem to do that. // in practice, it doesn't seem to do that.
//$flags|= ($mode & NET_SFTP_RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE; //$flags|= ($mode & NET_SFTP_RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
// if NET_SFTP_OPEN_APPEND worked as it should the following (up until the -----------) wouldn't be necessary if ($start >= 0) {
$offset = 0; $offset = $start;
if (($mode & NET_SFTP_RESUME) || $start >= 0) { } elseif ($mode & NET_SFTP_RESUME) {
if ($start >= 0) { // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
$offset = $start; $size = $this->_size($remote_file);
} else { $offset = $size !== false ? $size : 0;
$size = $this->_size($remote_file);
$offset = $size !== false ? $size : 0;
}
} else { } else {
$offset = 0;
$flags|= NET_SFTP_OPEN_TRUNCATE; $flags|= NET_SFTP_OPEN_TRUNCATE;
} }
// --------------
$packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0); $packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0);
if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) { if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
@ -1483,6 +1494,14 @@ class Net_SFTP extends Net_SSH2 {
return false; return false;
} }
$size = filesize($data); $size = filesize($data);
if ($local_start >= 0) {
fseek($fp, $local_start);
} elseif ($mode & NET_SFTP_RESUME_START) {
// do nothing
} else {
fseek($fp, $offset);
}
} else { } else {
$size = strlen($data); $size = strlen($data);
} }