Merge remote-tracking branch 'phpseclib/master' into php5

* phpseclib/master:
  SSH2: Continue Subsystem Implementation.
This commit is contained in:
Andreas Fischer 2013-11-20 23:19:12 +01:00
commit 71ad6b914f

View File

@ -2349,7 +2349,6 @@ class Net_SSH2 {
return false; return false;
} }
$channel = $this->in_request_pty_exec ? NET_SSH2_CHANNEL_EXEC : NET_SSH2_CHANNEL_SHELL;
return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd); return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd);
} }
@ -2430,8 +2429,7 @@ class Net_SSH2 {
*/ */
function reset() function reset()
{ {
$channel = $this->in_request_pty_exec ? NET_SSH2_CHANNEL_EXEC : NET_SSH2_CHANNEL_SHELL; $this->_close_channel($this->_get_interactive_channel());
$this->_close_channel($channel);
} }
/** /**