octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-14 18:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes based on comment 187537999

Browse Source
This commit is contained in:
Ivailo Hristov 2016-02-23 19:21:23 +02:00
parent 83b8d0ec0a
commit 56af770943
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
phpseclib/Net/SFTP.php
View File

@ -2064,41 +2064,31 @@ class SFTP extends SSH2
$start = $offset; $start = $offset;
$read = 0; $read = 0;
$break_loop = false; while (true) {
while (!$break_loop) { $i = 0;
$request_id_offset = 5;// just like that, a random number
$i = $request_id_offset;
while ($i < NET_SFTP_QUEUE_SIZE+$request_id_offset && ($length < 0 || $read < $length)) { while ($i < NET_SFTP_QUEUE_SIZE && ($length < 0 || $read < $length)) {
$subtemp = $start + $read; $subtemp = $start + $read;
$possible_packet_sizes = array($this->max_sftp_packet); $packet_size = $length > 0 ? min($this->max_sftp_packet, $length - $read) : $this->max_sftp_packet;
if ($length > 0 && $length - $read > 0) {
$possible_packet_sizes[] = $length - $read;
}
$packet_size = min($possible_packet_sizes);
$packet = pack('Na*N3', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, $packet_size); $packet = pack('Na*N3', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, $packet_size);
$this->request_id = $i;
if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) { if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
if ($fclose_check) { if ($fclose_check) {
fclose($fp); fclose($fp);
} }
return false; return false;
} }
$this->request_id=1;
$read += $packet_size; $read += $packet_size;
$i++; $i++;
} }
if ($i > $request_id_offset) { if ($i > 0) {
while ($i > $request_id_offset) { $break_loop = false;
$this->request_id = $i; while ($i > 0) {
$response = $this->_get_sftp_packet(); $response = $this->_get_sftp_packet();
$i--; $i--;
$this->request_id=1;
switch ($this->packet_type) { switch ($this->packet_type) {
case NET_SFTP_DATA: case NET_SFTP_DATA:
$temp = substr($response, 4); $temp = substr($response, 4);
@ -2112,8 +2102,7 @@ class SFTP extends SSH2
case NET_SFTP_STATUS: case NET_SFTP_STATUS:
// could, in theory, return false if !strlen($content) but we'll hold off for the time being // could, in theory, return false if !strlen($content) but we'll hold off for the time being
$this->_logError($response); $this->_logError($response);
// don't break out of the loop so we can read the remaining responses $break_loop = true; // don't break out of the loop yet, so we can read the remaining responses
$break_loop = true;
break; break;
default: default:
if ($fclose_check) { if ($fclose_check) {
@ -2122,8 +2111,12 @@ class SFTP extends SSH2
throw new \UnexpectedValueException('Expected SSH_FXP_DATA or SSH_FXP_STATUS'); throw new \UnexpectedValueException('Expected SSH_FXP_DATA or SSH_FXP_STATUS');
} }
} }
if ($break_loop) {
break;
}
} else { } else {
$break_loop = true; break;
} }
} }