1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 10:26:59 +01:00
Commit Graph

4424 Commits

Author SHA1 Message Date
terrafrost
c680c604c8 Merge branch '1.0' into 2.0 2020-12-19 01:07:08 -06:00
terrafrost
c21147a5bd SFTP: clean up real time logging 2020-12-19 01:05:36 -06:00
terrafrost
1d75d080f1 Merge branch '3.0' 2020-12-19 01:02:39 -06:00
terrafrost
31c5e50902 SFTP: change where stat cache is being cleared for uploads 2020-12-19 01:02:06 -06:00
terrafrost
9637e25bf7 add unit test for resuming uploads 2020-12-18 21:34:21 -06:00
terrafrost
df22fa0487 add unit test for stream_select addition 2020-12-18 21:29:09 -06:00
terrafrost
c1a9c5e6da Merge branch '3.0' 2020-12-18 17:32:25 -06:00
terrafrost
08478feee7 SFTP: resuming uploads didn't work 2020-12-18 17:31:55 -06:00
terrafrost
4d3e5ccf6d Merge branch '3.0' 2020-12-18 16:19:25 -06:00
terrafrost
20852adf78 SSH2/Stream: stream_select needs to be able to access $fsock 2020-12-18 16:12:14 -06:00
terrafrost
a77a56648e Merge branch '3.0' 2020-12-17 08:54:21 -06:00
terrafrost
203a4eb10a Merge branch '2.0' into 3.0 2020-12-17 08:54:14 -06:00
terrafrost
589efd3875 Merge branch '1.0' into 2.0 2020-12-17 08:54:06 -06:00
Remi Collet
cfa7d491bf Simplify test 2020-12-17 08:53:58 -06:00
terrafrost
5fcb2d4e34 Merge branch '3.0' 2020-12-17 08:14:20 -06:00
terrafrost
99e8d7b822 PKCS8: fix E_WARNING 2020-12-17 08:13:56 -06:00
Remi Collet
9ae6c8fd3a
Simplify test 2020-12-17 08:48:04 +01:00
terrafrost
2e3e8b13b8 Merge branch '3.0' 2020-12-17 00:11:17 -06:00
terrafrost
fe62c85e02 CHANGELOG: add 3.0.0 entry 2020-12-17 00:10:28 -06:00
terrafrost
b28b9472c8 Merge branch '2.0' into 3.0 2020-12-16 23:59:48 -06:00
terrafrost
136b9ca7ee CHANGELOG: add 2.0.30 entry 2020-12-16 23:42:04 -06:00
terrafrost
f0d91cccd8 Merge branch '1.0' into 2.0 2020-12-16 23:34:24 -06:00
terrafrost
b2bdbaa4f4 README: update for 3.0.0 release 2020-12-16 23:33:42 -06:00
terrafrost
d1c8c6dba1 Merge branch 'keepalive-master' 2020-12-16 23:15:16 -06:00
terrafrost
91ab47e4a5 Merge branch 'keepalive-2.0' into 2.0 2020-12-16 23:14:58 -06:00
terrafrost
2b5e205aec Merge branch 'keepalive-1.0' into 1.0 2020-12-16 23:14:49 -06:00
terrafrost
caa287b181 Merge branch 'keepalive-3.0' into keepalive-master 2020-12-16 09:13:28 -06:00
terrafrost
47e1ce60b3 SSH2: syntax error 2020-12-16 09:13:05 -06:00
terrafrost
0144a86e25 Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-16 09:12:45 -06:00
terrafrost
184c779d4a Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-16 09:11:52 -06:00
terrafrost
0399faa86b SSH2: syntax error 2020-12-16 09:10:35 -06:00
terrafrost
7a3bffdf99 Merge branch 'keepalive-3.0' into keepalive-master 2020-12-16 08:37:01 -06:00
terrafrost
32bfbcd7d2 Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-16 08:36:43 -06:00
terrafrost
07a7c19407 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-16 08:27:50 -06:00
terrafrost
8d567cdf29 SSH2: keepalive tweak 2020-12-16 08:26:03 -06:00
terrafrost
1f5d87212b Merge branch 'keepalive-3.0' into keepalive-master 2020-12-15 23:53:16 -06:00
terrafrost
0ddcff753f Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-15 23:52:53 -06:00
terrafrost
43b2708254 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-15 23:36:42 -06:00
terrafrost
f0501ff72b SSH2: get_binary_packet() doesn't know about channel type 2020-12-15 23:11:54 -06:00
terrafrost
20cec076ea Merge branch 'keepalive-3.0' into keepalive-master 2020-12-15 08:53:57 -06:00
terrafrost
a4af48c7a6 Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-15 08:52:43 -06:00
terrafrost
d904f08a46 SSH2: last merge should have used microtime(true) but didn't 2020-12-15 08:43:21 -06:00
terrafrost
a35535e9c6 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-15 08:39:38 -06:00
terrafrost
194e642448 SSH2: handle keepalive@openssh.com packets 2020-12-15 08:25:42 -06:00
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