Commit Graph

4154 Commits

Author SHA1 Message Date
terrafrost
15263f0c9c Merge branch '1.0' into 3.0 2021-11-11 19:38:52 -06:00
terrafrost
cee791820c Merge branch '1.0' into 2.0 2021-11-11 19:17:17 -06:00
terrafrost
fe4dc433cc SSH2: error out when no data is received from the server 2021-11-11 19:06:18 -06:00
terrafrost
0b7db9ebd6 Merge branch '1.0' into 3.0 2021-11-10 19:46:19 -06:00
terrafrost
fcf9dd6175 Merge branch '1.0' into 2.0 2021-11-10 19:45:36 -06:00
terrafrost
31eac61820 Bootstrap: use version_compare instead of PHP_VERSION_ID 2021-11-10 19:45:31 -06:00
yangming
c91671f176 mbstring.func_overload is deprecated in php 6.2 and removed in php 8.0 2021-11-10 19:44:24 -06:00
terrafrost
17e79d9341 Merge branch '2.0' into 3.0 2021-11-08 06:44:55 -06:00
terrafrost
f92a58c83c SFTP: getSupportedVersions() call didn't work 2021-11-08 06:44:36 -06:00
terrafrost
a0405d4816 Merge branch '2.0' into 3.0 2021-11-03 22:28:16 -05:00
terrafrost
9fb26d478a Merge branch '1.0' into 2.0 2021-11-03 22:16:57 -05:00
terrafrost
29c8591cb2 SSH2: add "smart multi factor" login mode (enabled by default) 2021-11-03 22:16:14 -05:00
terrafrost
878526d7c9 SSH2: CS adjustments 2021-10-30 18:16:23 -05:00
terrafrost
13b9663ac6 Merge branch '1.0' into 3.0 2021-10-30 18:15:28 -05:00
terrafrost
895cf85dff Merge branch '0.0' into 2.0 2021-10-30 18:04:25 -05:00
vgogolin
1a942620b3 Backward compatibility with old PHP versions
Fix for PHP Parse error:  syntax error, unexpected '[' in /vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php on line 3558
2021-10-30 18:04:19 -05:00
terrafrost
6e794226a3 Merge branch '2.0' into 3.0 2021-10-26 22:01:46 -05:00
terrafrost
98a6fe587f CHANGELOG: add 2.0.34 release 2021-10-26 21:46:30 -05:00
terrafrost
7a739d75fe Merge branch '2.0' into 3.0 2021-10-26 20:48:46 -05:00
terrafrost
dc290a1fa3 Merge branch '1.0' into 2.0 2021-10-26 20:17:40 -05:00
terrafrost
0539780a86 Travis: rm 5.3 support; composer won't install on it 2021-10-26 20:16:46 -05:00
terrafrost
2de84fba24 Merge branch '1.0' into 2.0 2021-10-26 20:14:31 -05:00
terrafrost
da6c1b06bf SSH2: add support for zlib and zlib@openssh.com compression 2021-10-26 20:04:53 -05:00
terrafrost
01cdf396b2 Merge branch '2.0' into 3.0 2021-10-13 22:00:32 -05:00
terrafrost
3da069570c Merge branch '1.0' into 2.0 2021-10-13 22:00:20 -05:00
terrafrost
30a9a1541c Tests/SSH2: fix intermittently failing unit test 2021-10-13 21:03:54 -05:00
Christopher Davis
24150b26f6 Don't Use Array Unpackage for Status Code -> Error
the `status_codes` property is an array with integer keys and string
values, but the `$error` value in `SFTP::logError` was trying to be unpacked
from an array.

Seems to come from cee3f3cd4a, but even at
that commit the `status_codes` data structure was still an array.

This bug is only present in 3.X, 2.X release didn't unpack here:
a684f12065/phpseclib/Net/SFTP.php (L829)
2021-10-13 19:58:27 -05:00
terrafrost
2ec8356121 Merge branch '2.0' into 3.0 2021-10-12 20:37:34 -05:00
terrafrost
a684f12065 Merge branch '1.0' into 2.0 2021-10-12 20:37:27 -05:00
terrafrost
6f8d12ffc7 Tests: tests were being skipped because their deps had no asserts 2021-10-12 20:35:38 -05:00
terrafrost
a2c30f9d33 Merge branch '2.0' into 3.0 2021-10-11 09:15:37 -05:00
terrafrost
eacb9f8614 Merge branch '1.0' into 2.0 2021-10-11 09:02:22 -05:00
terrafrost
74f1c9ed7b SSH2: CS adjustments 2021-10-11 08:58:43 -05:00
terrafrost
9a61525f44 SSH2: rm unnecessary code 2021-10-11 08:53:21 -05:00
terrafrost
0fe328936c SSH2: implement a different fix for #1613 2021-10-11 08:47:51 -05:00
terrafrost
2564032e6f Merge branch '2.0' into 3.0 2021-10-09 13:32:07 -05:00
terrafrost
2f3ca7123d SSH2: fix channel constant 2021-10-09 13:31:14 -05:00
terrafrost
b3e39538b8 Merge branch '2.0' into 3.0 2021-10-09 13:27:40 -05:00
terrafrost
7b2097c6bd Merge branch '1.0' into 2.0 2021-10-09 13:24:22 -05:00
terrafrost
1fab947f01 SSH2: fixes for noisy channels 2021-10-09 13:21:09 -05:00
terrafrost
644af71b6c SSH2: readd public for 3.0 branch 2021-10-09 13:00:30 -05:00
terrafrost
025b8beb8f Merge branch '2.0' into 3.0 2021-10-09 13:00:03 -05:00
terrafrost
fe6e2b9bfe Merge branch '1.0' into 2.0 2021-10-09 12:59:56 -05:00
terrafrost
b29f134c24 SSH2: CS adjustments 2021-10-09 12:59:48 -05:00
terrafrost
844a8d2c3a Merge branch '2.0' into 3.0 2021-10-09 08:28:37 -05:00
terrafrost
f25f8c0db8 Merge branch '1.0' into 2.0 2021-10-09 08:26:29 -05:00
terrafrost
8d4831ad1f SFTP: CS adjustments 2021-10-09 08:26:11 -05:00
terrafrost
cd80f98788 Merge branch '2.0' into 3.0 2021-10-09 07:51:17 -05:00
terrafrost
7c14eedbfd Merge branch '1.0' into 2.0 2021-10-09 07:50:36 -05:00
terrafrost
e4d2416bdc SSH2: SSH-2.0-CoreFTP is 15 bytes long - not 13 2021-10-09 07:50:10 -05:00