octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-09 23:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103 from rlerdorf/patch-1

Browse Source 
Fix a couple of minor logic problems
This commit is contained in:
terrafrost 2013-05-08 05:19:49 -07:00
commit 9ac94a7b74
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Net/SCP.php
View File

@ -201,7 +201,7 @@ class Net_SCP {
return false;
}
$size = filesize($data);
for ($i = 0; $i < $length; $i++) {
for ($i = 0; $i < $size; $i += $this->packet_size) {
$this->_send(fgets($fp, $this->packet_size));
}
fclose($fp);
@ -338,4 +338,4 @@ class Net_SCP {
$this->ssh->disconnect();
}
}
}
}

6
phpseclib/Net/SFTP/Stream.php
View File

@ -262,7 +262,7 @@ class Net_SFTP_Stream {
}
}
$this->pos = $this->mode[0] != 'a' ? 0 : $size;
$this->pos = $this->mode[0] != 'a' ? 0 : $this->size;
return true;
}
@ -297,7 +297,7 @@ class Net_SFTP_Stream {
return 0;
}
// seems that PHP calls stream_read in 8k chunks
call_user_func($this->notification, STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, strlen($result), $size);
call_user_func($this->notification, STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, strlen($result), $this->size);
}
if (empty($result)) { // ie. false or empty string
@ -756,4 +756,4 @@ class Net_SFTP_Stream {
}
}
stream_wrapper_register('sftp', 'Net_SFTP_Stream');
stream_wrapper_register('sftp', 'Net_SFTP_Stream');