From 8530cbca1ace6b522f0cf8c754ef6abbc95f9a9a Mon Sep 17 00:00:00 2001 From: terrafrost Date: Wed, 29 Jun 2016 00:18:35 -0500 Subject: [PATCH 1/2] Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error --- tests/Functional/Net/SFTPUserStoryTest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php index 9f0977e6..0817345e 100644 --- a/tests/Functional/Net/SFTPUserStoryTest.php +++ b/tests/Functional/Net/SFTPUserStoryTest.php @@ -708,5 +708,19 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase $this->assertFalse($sftp->is_writable('nonexistantfile.ext')); $this->assertFalse($sftp->is_writeable('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(); } } From 7bc0e61c1d8d6a77bc48df8f2b4d052241621708 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Wed, 29 Jun 2016 00:30:28 -0500 Subject: [PATCH 2/2] SSH2: fix "Expected SSH_FXP_STATUS or ..." error --- phpseclib/Net/SSH2.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 87e07525..2fd2a8f9 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -3473,7 +3473,9 @@ class Net_SSH2 } $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE; - return true; + if ($client_channel == $channel) { + return true; + } case NET_SSH2_MSG_CHANNEL_EOF: break; default: