mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-13 10:01:47 +00:00
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2
This commit is contained in:
commit
f17f1b2baf
@ -7,7 +7,6 @@ php:
|
|||||||
- 5.5.9
|
- 5.5.9
|
||||||
- 5.5
|
- 5.5
|
||||||
- 5.6
|
- 5.6
|
||||||
- hhvm
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
@ -18,7 +17,13 @@ env:
|
|||||||
before_install: true
|
before_install: true
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install parallel
|
- wget http://ftp.gnu.org/gnu/parallel/parallel-20120522.tar.bz2
|
||||||
|
- tar -xvjf parallel*
|
||||||
|
- cd parallel*
|
||||||
|
- ./configure
|
||||||
|
- make
|
||||||
|
- sudo make install
|
||||||
|
- cd ..
|
||||||
- eval `ssh-agent -s`
|
- eval `ssh-agent -s`
|
||||||
- travis/setup-secure-shell.sh
|
- travis/setup-secure-shell.sh
|
||||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
|
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
|
||||||
|
@ -3880,7 +3880,11 @@ class Net_SSH2
|
|||||||
*/
|
*/
|
||||||
function getLastError()
|
function getLastError()
|
||||||
{
|
{
|
||||||
return $this->errors[count($this->errors) - 1];
|
$count = count($this->errors);
|
||||||
|
|
||||||
|
if ($count > 0) {
|
||||||
|
return $this->errors[$count - 1];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user