octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpseclib/phpseclib

Browse Source
This commit is contained in:
terrafrost 2018-10-06 14:17:30 -05:00
commit edc51aac63
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Net/SFTP.php
View File

@ -55,8 +55,8 @@ class SFTP extends SSH2
* *
* \phpseclib\Net\SSH2::exec() uses 0 and \phpseclib\Net\SSH2::read() / \phpseclib\Net\SSH2::write() use 1. * \phpseclib\Net\SSH2::exec() uses 0 and \phpseclib\Net\SSH2::read() / \phpseclib\Net\SSH2::write() use 1.
* *
* @see \phpseclib\Net\SSH2::_send_channel_packet() * @see \phpseclib\Net\SSH2::send_channel_packet()
* @see \phpseclib\Net\SSH2::_get_channel_packet() * @see \phpseclib\Net\SSH2::get_channel_packet()
* @access private * @access private
*/ */
const CHANNEL = 0x100; const CHANNEL = 0x100;
@ -2985,7 +2985,7 @@ class SFTP extends SSH2
* @param int $type * @param int $type
* @param string $data * @param string $data
* @see self::_get_sftp_packet() * @see self::_get_sftp_packet()
* @see self::_send_channel_packet() * @see self::send_channel_packet()
* @return bool * @return bool
* @access private * @access private
*/ */

2
phpseclib/Net/SSH1.php
View File

@ -420,7 +420,7 @@ class SSH1
/** /**
* Current Timeout * Current Timeout
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @access private * @access private
*/ */
private $curTimeout; private $curTimeout;

26
phpseclib/Net/SSH2.php
View File

@ -100,8 +100,8 @@ class SSH2
* open request, and 'sender channel' is the channel number allocated by * open request, and 'sender channel' is the channel number allocated by
* the other side. * the other side.
* *
* @see \phpseclib\Net\SSH2::_send_channel_packet() * @see \phpseclib\Net\SSH2::send_channel_packet()
* @see \phpseclib\Net\SSH2::_get_channel_packet() * @see \phpseclib\Net\SSH2::get_channel_packet()
* @access private * @access private
*/ */
const CHANNEL_EXEC = 1; // PuTTy uses 0x100 const CHANNEL_EXEC = 1; // PuTTy uses 0x100
@ -502,7 +502,7 @@ class SSH2
* *
* Maps client channels to server channels * Maps client channels to server channels
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @see self::exec() * @see self::exec()
* @var array * @var array
* @access private * @access private
@ -515,7 +515,7 @@ class SSH2
* If a client requests a packet from one channel but receives two packets from another those packets should * If a client requests a packet from one channel but receives two packets from another those packets should
* be placed in a buffer * be placed in a buffer
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @see self::exec() * @see self::exec()
* @var array * @var array
* @access private * @access private
@ -527,7 +527,7 @@ class SSH2
* *
* Contains the type of the last sent message * Contains the type of the last sent message
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @var array * @var array
* @access private * @access private
*/ */
@ -538,7 +538,7 @@ class SSH2
* *
* Maximum packet size indexed by channel * Maximum packet size indexed by channel
* *
* @see self::_send_channel_packet() * @see self::send_channel_packet()
* @var array * @var array
* @access private * @access private
*/ */
@ -568,7 +568,7 @@ class SSH2
* Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB) * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB)
* *
* @var int * @var int
* @see self::_send_channel_packet() * @see self::send_channel_packet()
* @see self::exec() * @see self::exec()
* @access private * @access private
*/ */
@ -579,7 +579,7 @@ class SSH2
* *
* Window size indexed by channel * Window size indexed by channel
* *
* @see self::_send_channel_packet() * @see self::send_channel_packet()
* @var array * @var array
* @access private * @access private
*/ */
@ -590,7 +590,7 @@ class SSH2
* *
* Window size indexed by channel * Window size indexed by channel
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @var array * @var array
* @access private * @access private
*/ */
@ -650,7 +650,7 @@ class SSH2
/** /**
* Current Timeout * Current Timeout
* *
* @see self::_get_channel_packet() * @see self::get_channel_packet()
* @access private * @access private
*/ */
protected $curTimeout; protected $curTimeout;
@ -2743,7 +2743,7 @@ class SSH2
/** /**
* Execute Command * Execute Command
* *
* If $callback is set to false then \phpseclib\Net\SSH2::_get_channel_packet(self::CHANNEL_EXEC) will need to be called manually. * If $callback is set to false then \phpseclib\Net\SSH2::get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
* In all likelihood, this is not a feature you want to be taking advantage of. * In all likelihood, this is not a feature you want to be taking advantage of.
* *
* @param string $command * @param string $command
@ -3074,7 +3074,7 @@ class SSH2
$channel = $this->get_interactive_channel(); $channel = $this->get_interactive_channel();
if ($mode == self::READ_NEXT) { if ($mode == self::READ_NEXT) {
return $this->_get_channel_packet($channel); return $this->get_channel_packet($channel);
} }
$match = $expect; $match = $expect;
@ -3794,7 +3794,7 @@ class SSH2
case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA: case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
/* /*
if ($client_channel == NET_SSH2_CHANNEL_EXEC) { if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
$this->_send_channel_packet($client_channel, chr(0)); $this->send_channel_packet($client_channel, chr(0));
} }
*/ */
// currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR