danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-11 08:39:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pty-enhancement' into 1.0

Browse Source
This commit is contained in:
terrafrost 2016-12-24 20:28:19 -06:00
commit 785b477605
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpseclib/Net/SSH2.php
View File

@ -2601,6 +2601,11 @@ class Net_SSH2
return false; return false;
} }
if ($this->in_request_pty_exec) {
user_error('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
return false;
}
// RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
// be adjusted". 0x7FFFFFFF is, at 2GB, the max size. technically, it should probably be decremented, but, // be adjusted". 0x7FFFFFFF is, at 2GB, the max size. technically, it should probably be decremented, but,
// honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway. // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
@ -3408,6 +3413,10 @@ class Net_SSH2
*/ */
function disablePTY() function disablePTY()
{ {
if ($this->in_request_pty_exec) {
$this->_close_channel(NET_SSH2_CHANNEL_EXEC);
$this->in_request_pty_exec = false;
}
$this->request_pty = false; $this->request_pty = false;
} }