1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-14 18:15:39 +01:00
Commit Graph

4049 Commits

Author SHA1 Message Date
terrafrost
ac2770e359 Merge branch '3.0' 2020-12-30 05:25:11 -06:00
terrafrost
b14caee559 Merge branch '2.0' into 3.0 2020-12-30 05:25:02 -06:00
terrafrost
d2cadfd329 Merge branch '1.0' into 2.0 2020-12-30 05:24:54 -06:00
terrafrost
6c090804e7
Merge pull request #1554 from williamdes/1.0
Fix a Doctum 5.3.0-dev phpdoc reported error
2020-12-30 05:24:37 -06:00
terrafrost
1ee5c3971d Merge branch '3.0' 2020-12-30 05:23:39 -06:00
terrafrost
f8d9aa8c49
Merge pull request #1550 from remicollet/patch-1
Simplify test
2020-12-30 05:23:14 -06:00
terrafrost
4926098440 Merge branch '3.0' 2020-12-30 05:21:13 -06:00
terrafrost
a19b5b4ca8 update how @internal phpdoc attributes are used 2020-12-30 05:05:54 -06:00
terrafrost
a2b390d725 Merge branch '3.0' 2020-12-23 10:41:04 -06:00
terrafrost
7a9418e4e0 SSH2: suppress errors on stream_select calls 2020-12-23 10:39:00 -06:00
terrafrost
44a4dfb7ac Merge branch '3.0' 2020-12-23 10:27:20 -06:00
terrafrost
19afa6300a CHANGELOG: add note about namespace change 2020-12-23 10:27:03 -06:00
terrafrost
1e44f1fc8d Merge branch '3.0' 2020-12-23 08:17:43 -06:00
Bastien Miclo
ba89cdbf0f Support DateTimeImmutable 2020-12-23 08:16:22 -06:00
terrafrost
f77930aa83 Merge branch '3.0' 2020-12-23 07:49:30 -06:00
Bastien Miclo
224abbc1f9 Show array-failure in load() method 2020-12-23 07:49:08 -06:00
terrafrost
18ae08bfdf Merge branch '3.0' 2020-12-23 07:06:53 -06:00
terrafrost
02fa3b142e EC/PKCS1: throw exception when trying to load non-strings 2020-12-23 07:06:04 -06:00
William Desportes
1f66009c1b
Fix a Doctum 5.3.0-dev phpdoc reported error 2020-12-19 21:28:29 +01:00
terrafrost
9e2b8b2375 Merge branch '3.0' 2020-12-19 01:52:47 -06:00
terrafrost
094bcbdd97 CHANGELOG: add 3.0.1 release 2020-12-19 01:52:34 -06:00
terrafrost
e5efc6e24f Merge branch '3.0' 2020-12-19 01:14:13 -06:00
terrafrost
5e1c890ac6 Tests: fix bad unit test 2020-12-19 01:14:06 -06:00
terrafrost
6ff6bc9433 Merge branch '3.0' 2020-12-19 01:12:25 -06:00
terrafrost
f5d7c06264 Merge branch '2.0' into 3.0 2020-12-19 01:12:16 -06:00
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