Merge branch '1.0' into ssh2-fix-multi-channel-1.0

This commit is contained in:
terrafrost 2017-09-06 00:30:11 -05:00
commit e50d8ea51c
4 changed files with 5 additions and 7 deletions

View File

@ -1,7 +1,6 @@
language: php
php:
- 5.3
- 5.4
- 5.5.9
- 5.5
@ -18,7 +17,7 @@ env:
before_install: true
install:
- wget http://ftp.gnu.org/gnu/parallel/parallel-20120522.tar.bz2
- wget http://ftp.gnu.org/gnu/parallel/parallel-20170822.tar.bz2
- tar -xvjf parallel*
- cd parallel*
- ./configure

View File

@ -2115,7 +2115,7 @@ class File_X509
if (!isset($date)) {
$date = class_exists('DateTime') ?
new DateTime($date, new DateTimeZone(date_default_timezone_get())) :
new DateTime($date, new DateTimeZone(@date_default_timezone_get())) :
time();
}
@ -3909,7 +3909,7 @@ class File_X509
{
if (class_exists('DateTime')) {
$date = new DateTime($date);
$this->startDate = $date->format('D, d M Y H:i:s O');
$this->startDate = $date->format('D, d M Y H:i:s O', new DateTimeZone(@date_default_timezone_get()));
} else {
$this->startDate = @date('D, d M Y H:i:s O', @strtotime($date));
}
@ -3937,7 +3937,7 @@ class File_X509
$this->endDate = new File_ASN1_Element($temp);
} else {
if (class_exists('DateTime')) {
$date = new DateTime($date);
$date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
$this->endDate = $date->format('D, d M Y H:i:s O');
} else {
$this->endDate = @date('D, d M Y H:i:s O', @strtotime($date));

View File

@ -2036,7 +2036,7 @@ class Net_SFTP extends Net_SSH2
if (isset($fp)) {
$stat = fstat($fp);
$size = $stat['size'];
$size = !empty($stat) ? $stat['size'] : 0;
if ($local_start >= 0) {
fseek($fp, $local_start);

View File

@ -907,7 +907,6 @@ class Net_SSH2
*/
var $decrypt_algorithm = '';
/**
* Should we try to re-connect to re-establish keys?
*