Merge branch '2.0'

This commit is contained in:
terrafrost 2016-07-10 12:56:12 -05:00
commit 3c1985a619
2 changed files with 17 additions and 1 deletions

View File

@ -3381,7 +3381,9 @@ class SSH2
} }
$this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE; $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
if ($client_channel == $channel) {
return true; return true;
}
case NET_SSH2_MSG_CHANNEL_EOF: case NET_SSH2_MSG_CHANNEL_EOF:
break; break;
default: default:

View File

@ -710,5 +710,19 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
$this->assertFalse($sftp->is_writable('nonexistantfile.ext')); $this->assertFalse($sftp->is_writable('nonexistantfile.ext'));
$this->assertFalse($sftp->is_writeable('nonexistantfile.ext')); $this->assertFalse($sftp->is_writeable('nonexistantfile.ext'));
$this->assertFalse($sftp->is_readable('nonexistantfile.ext')); $this->assertFalse($sftp->is_readable('nonexistantfile.ext'));
return $sftp;
}
/**
* @depends testReadableWritable
* @group github999
*/
public function testExecNlist($sftp)
{
$sftp->enablePTY();
$sftp->exec('ping google.com -c 5');
sleep(5);
$sftp->nlist();
} }
} }