1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-04 02:28:06 +01:00

Merge branch '2.0'

This commit is contained in:
terrafrost 2017-06-19 22:34:28 -05:00
commit b6eb7b2009

View File

@ -144,6 +144,10 @@ class SSH2
* Returns when a string matching the regular expression $expect is found
*/
const READ_REGEX = 2;
/**
* Returns when a string matching the regular expression $expect is found
*/
const READ_NEXT = 3;
/**
* Make sure that the log never gets larger than this
*/
@ -2828,6 +2832,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) {