From c7e67721a2d73e6df6774bfd58706d53a79dc003 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 28 Aug 2017 22:44:58 -0500 Subject: [PATCH 1/4] SSH2: CS adjustment --- phpseclib/Net/SSH2.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 21de21e9..bec43f1e 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -907,7 +907,6 @@ class Net_SSH2 */ var $decrypt_algorithm = ''; - /** * Should we try to re-connect to re-establish keys? * From 4b1102de7e30f41dd93adcab73134ef7891e423b Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 28 Aug 2017 23:29:03 -0500 Subject: [PATCH 2/4] X509: updates to DateTime integration --- phpseclib/File/X509.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index d6eaf47b..5ca54858 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -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)); From deb485c0e1e32de4408d3d5e69ab64366abc7ff8 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Tue, 5 Sep 2017 21:59:51 -0500 Subject: [PATCH 3/4] SFTP: fix put() with remote file stream resource (#1177) --- phpseclib/Net/SFTP.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 116e7e49..a0b36323 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -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); From fa82c4efdc049563ba14a394043500fc1a82f9df Mon Sep 17 00:00:00 2001 From: terrafrost Date: Tue, 5 Sep 2017 22:42:06 -0500 Subject: [PATCH 4/4] Travis: update version of parallel --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59d92155..65e69403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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