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

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2023-08-28 08:51:02 -05:00
commit bc62673fdd
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpseclib/Net/SFTP.php
View File

@ -2693,14 +2693,6 @@ class SFTP extends SSH2
} }
} }
if ($length > 0 && $length <= $offset - $start) {
if ($local_file === false) {
$content = substr($content, 0, $length);
} else {
ftruncate($fp, $length + $res_offset);
}
}
if ($fclose_check) { if ($fclose_check) {
fclose($fp); fclose($fp);

13
tests/Functional/Net/SFTPUserStoryTest.php
View File

@ -779,5 +779,18 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
$stat2 = $sftp->stat(self::$scratchDir); $stat2 = $sftp->stat(self::$scratchDir);
$this->assertSame($stat['uid'], $stat2['uid']); $this->assertSame($stat['uid'], $stat2['uid']);
$this->assertSame($stat['gid'], $stat2['gid']); $this->assertSame($stat['gid'], $stat2['gid']);
return $sftp;
}
/**
* @depends testChownChgrp
* @group github1934
*/
public function testCallableGetWithLength($sftp)
{
$sftp->put('test.txt', 'zzzzz');
$sftp->get('test.txt', function($data) {}, 0, 1);
$this->assertTrue(true);
} }
} }