octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SSH2: add $callable parameter to exec()

This commit is contained in:
terrafrost 2013-05-28 17:02:27 -05:00
parent f596c577cf
commit dc76cf5b8e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpseclib/Net/SSH2.php
View File

@ -2013,7 +2013,7 @@ class Net_SSH2 {
* @return String
* @access public
*/
function exec($command, $block = true)
function exec($command, $callback = NULL)
{
$this->curTimeout = $this->timeout;
$this->stdErrorLog = '';
@ -2097,7 +2097,7 @@ class Net_SSH2 {
$this->channel_status[NET_SSH2_CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
if (!$block || $this->in_request_pty_exec) {
if ($callback === false || $this->in_request_pty_exec) {
return true;
}
@ -2106,11 +2106,15 @@ class Net_SSH2 {
$temp = $this->_get_channel_packet(NET_SSH2_CHANNEL_EXEC);
switch (true) {
case $temp === true:
return $output;
return is_callable($callback) ? true : $output;
case $temp === false:
return false;
default:
$output.= $temp;
if (is_callable($callback)) {
$callback($temp);
} else {
$output.= $temp;
}
}
}
}