octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-15 17:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2022-01-08 19:51:35 -06:00
commit ddfb217855
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Net/SFTP.php
View File

@ -1635,7 +1635,7 @@ class SFTP extends SSH2
public function chgrp($filename, $gid, $recursive = false) public function chgrp($filename, $gid, $recursive = false)
{ {
$attr = $this->version < 4 ? $attr = $this->version < 4 ?
pack('N3', NET_SFTP_ATTR_UIDGID, $gid, -1) : pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid) :
Strings::packSSH2('Nss', NET_SFTP_ATTR_OWNERGROUP, '', $gid); Strings::packSSH2('Nss', NET_SFTP_ATTR_OWNERGROUP, '', $gid);
return $this->setstat($filename, $attr, $recursive); return $this->setstat($filename, $attr, $recursive);

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

@ -765,5 +765,22 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
$list_cache_disabled = $sftp->rawlist('.', true); $list_cache_disabled = $sftp->rawlist('.', true);
$this->assertEquals($list_cache_enabled, $list_cache_disabled, 'The files should be the same regardless of stat cache', 0.0, 10, true); $this->assertEquals($list_cache_enabled, $list_cache_disabled, 'The files should be the same regardless of stat cache', 0.0, 10, true);
return $sftp;
}
/**
* @depends testRawlistDisabledStatCache
*/
public function testChownChgrp($sftp)
{
$stat = $sftp->stat(self::$scratchDir);
$this->assertTrue($sftp->chown(self::$scratchDir, $stat['uid']));
$this->assertTrue($sftp->chgrp(self::$scratchDir, $stat['gid']));
$sftp->clearStatCache();
$stat2 = $sftp->stat(self::$scratchDir);
$this->assertSame($stat['uid'], $stat2['uid']);
$this->assertSame($stat['gid'], $stat2['gid']);
} }
} }