Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-06-19 22:34:20 -05:00
commit 9814140055

View File

@ -140,6 +140,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
*/
@ -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) {