Commit Graph

3878 Commits

Author SHA1 Message Date
terrafrost
e4dc5bd55a Merge branch '3.0' 2020-12-13 09:49:09 -06:00
terrafrost
eb4e02debe PHPUnit 4 is redundant for phpseclib 3.0 2020-12-13 09:09:14 -06:00
terrafrost
727d337c1d Merge branch '3.0' 2020-12-13 02:24:20 -06:00
terrafrost
a2a5bf1003 Merge branch '2.0' into 3.0 2020-12-13 02:24:02 -06:00
terrafrost
c5d9534ada fix bad merge 2020-12-13 00:57:30 -06:00
terrafrost
61d885630f CS adjustment 2020-12-12 22:32:46 -06:00
terrafrost
c25dff2ef0 Merge branch '2.0-class-rename' into 3.0-class-rename 2020-12-12 22:26:03 -06:00
terrafrost
360afd93c8 fix bad merge 2020-12-12 22:15:40 -06:00
terrafrost
0676524dfd Merge branch '1.0-class-rename' into 2.0-class-rename 2020-12-12 21:41:10 -06:00
terrafrost
e6abc61f45 rm adding of dupe classes (they break annotations) 2020-12-12 21:39:58 -06:00
terrafrost
1a30cd862f ... 2020-12-12 20:13:42 -06:00
terrafrost
7237c0f803 fix bad merge 2020-12-12 19:34:38 -06:00
terrafrost
e4bf7b111a Merge branch '2.0' into 3.0 2020-12-12 19:22:36 -06:00
terrafrost
185139f5c8 Merge branch '1.0' into 2.0 2020-12-12 17:39:38 -06:00
terrafrost
95432478c0 fix bad merge 2020-12-12 17:39:32 -06:00
terrafrost
245a84b57f make unit tests pass without gnu parallel 2020-12-12 17:26:44 -06:00
terrafrost
5701295017 Merge branch '1.0' into 2.0 2020-12-12 17:13:41 -06:00
terrafrost
266f16816a enable unit tests for PHP 8 / PHPUnit 9 2020-12-12 15:11:04 -06:00
terrafrost
af30bca1d0 Merge branch '3.0' 2020-12-07 08:40:38 -06:00
terrafrost
c08683402e Merge branch '2.0' into 3.0 2020-12-07 08:04:12 -06:00
terrafrost
07e1160108 Merge branch '1.0' into 2.0 2020-12-07 08:01:58 -06:00
terrafrost
ee4af462b6 SSH2: end connection faster for algorithm mismatch 2020-12-07 08:00:44 -06:00
terrafrost
ecafd8612d Merge branch '3.0' 2020-11-26 21:09:26 -06:00
terrafrost
afca3030c0 Merge branch '2.0' into 3.0 2020-11-26 21:09:21 -06:00
terrafrost
1ec3efa04b Merge branch '1.0' into 2.0 2020-11-26 21:09:17 -06:00
terrafrost
0b20aff6ff SFTP: CS adjustments 2020-11-26 21:08:49 -06:00
terrafrost
6e2960e304 Merge branch '3.0' 2020-11-26 19:11:40 -06:00
terrafrost
b310f694ef Merge branch '2.0' into 3.0 2020-11-26 19:10:48 -06:00
terrafrost
bf03b0302b Merge branch '1.0' into 2.0 2020-11-26 19:10:39 -06:00
Adrian
9547587cb7 SFTP: add stream to get method 2020-11-26 18:56:02 -06:00
terrafrost
fefac4ba66 README: make travis-ci.com run for master branch instead of 3.0 2020-11-21 12:17:36 -06:00
terrafrost
aae9131bec Merge branch '3.0' 2020-11-21 12:16:56 -06:00
terrafrost
a609b9fcf5 Merge branch '2.0' into 3.0 2020-11-21 12:11:38 -06:00
terrafrost
f6d441e9ac Merge branch '1.0' into 2.0 2020-11-21 11:59:51 -06:00
terrafrost
40b67bf939 README: travis-ci.org -> travis-ci.com 2020-11-21 11:55:24 -06:00
terrafrost
77ed1d6a01 Merge branch '3.0' 2020-11-21 10:51:45 -06:00
terrafrost
e69b79eba7 Merge branch 'codelts' into 3.0 2020-11-21 10:51:30 -06:00
terrafrost
7eca0af4f2 Merge branch '3.0' 2020-11-02 19:54:43 -06:00
terrafrost
dd5e7742ea Merge branch '2.0' into 3.0 2020-11-02 19:54:32 -06:00
terrafrost
42b84143e7 Merge branch '1.0' into 2.0 2020-11-02 19:54:25 -06:00
terrafrost
d9196e4a83 X509: fix unit test for multi-cert pems 2020-11-02 19:54:11 -06:00
terrafrost
5492361206 Merge branch '3.0' 2020-11-01 09:31:28 -06:00
terrafrost
7e337c9bd7 Merge branch '2.0' into 3.0 2020-11-01 09:31:17 -06:00
terrafrost
e18880009b Merge branch '1.0' into 2.0 2020-10-31 15:15:06 -05:00
Thomas A. Hirsch
b2ae60f0a9 $progressCallback should be called after a specific amount of data has been received and not, if its just requested, as the requested packets might be more as the available and received data. 2020-10-31 15:05:05 -05:00
terrafrost
e220455d27 Merge branch '3.0' 2020-10-30 05:57:46 -05:00
terrafrost
336fe5c8f8 Merge branch '2.0' into 3.0 2020-10-29 21:46:30 -05:00
terrafrost
a72e0e7456 Tests/X509: update unit test for 2.0 branch 2020-10-29 21:35:59 -05:00
terrafrost
da96fbd212 Merge branch '1.0' into 2.0 2020-10-29 21:35:41 -05:00
terrafrost
00c9edc058 X509: don't attempt to parse multi-cert PEMs 2020-10-29 21:30:01 -05:00