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

Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-06-19 22:35:22 -05:00
parent 9d0c924cbd 7606f81279
commit 3cbb9516ef
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpseclib/Net/SSH2.php
View File

@ -126,6 +126,10 @@ class SSH2
* Dumps the content real-time to a file
*/
const LOG_REALTIME_FILE = 4;
/**
* Make sure that the log never gets larger than this
*/
const LOG_MAX_SIZE = 1048576; // 1024 * 1024
/**#@-*/
/**#@+
@ -141,9 +145,9 @@ class SSH2
*/
const READ_REGEX = 2;
/**
* Make sure that the log never gets larger than this
* Returns when a string matching the regular expression $expect is found
*/
const LOG_MAX_SIZE = 1048576; // 1024 * 1024
const READ_NEXT = 3;
/**#@-*/
/**
@ -2813,6 +2817,10 @@ class SSH2
$channel = $this->_get_interactive_channel();
if ($mode == self::READ_NEXT) {
return $this->_get_channel_packet($channel);
}
$match = $expect;
while (true) {
if ($mode == self::READ_REGEX) {