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

3572 Commits

Author SHA1 Message Date
terrafrost
de3bb2e300 Merge branch '1.0' into 2.0 2016-11-20 18:13:41 -06:00
terrafrost
6fb34887c5 SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M) 2016-11-20 18:13:01 -06:00
terrafrost
ad03dcad1c Merge branch '2.0' 2016-11-20 18:05:02 -06:00
terrafrost
27a6b6362a Merge branch '1.0' into 2.0 2016-11-20 18:04:55 -06:00
terrafrost
a2d9622bf9 SFTP: update directory deletion check (#1059) 2016-11-20 18:03:01 -06:00
terrafrost
6807791d42 Merge branch '2.0' 2016-11-20 11:14:48 -06:00
terrafrost
abf3899e1f Merge branch '1.0' into 2.0 2016-11-20 11:14:35 -06:00
terrafrost
7cb66ea56e SSH2: don't use timeout value of 0 for fsockopen 2016-11-20 11:08:53 -06:00
terrafrost
48cf16599b suppress unpack() PHP warnings 2016-11-19 22:39:36 -06:00
terrafrost
b8e1a15291 Merge branch '2.0' 2016-11-19 20:40:04 -06:00
terrafrost
f981310266 Merge branch '1.0' into 2.0 2016-11-19 20:39:58 -06:00
terrafrost
b70cb87641 SFTP: don't delete directory if $path is empty 2016-11-19 20:39:05 -06:00
terrafrost
d1fa327ef9 Merge branch '2.0' 2016-11-18 20:48:18 -06:00
terrafrost
51bafdebe2 SFTP: CS adjustment 2016-11-18 20:48:01 -06:00
terrafrost
d6bf2b4f73 Merge branch '2.0' 2016-11-18 20:37:26 -06:00
terrafrost
8b4208ee60 SFTP: logging didn't work correctly in 2.0 branch 2016-11-18 20:37:08 -06:00
terrafrost
f9f95af921 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2016-11-17 22:18:47 -06:00
terrafrost
989fc3735a Merge branch '2.0' 2016-11-17 20:55:53 -06:00
terrafrost
76f6c59244 Merge branch '1.0' into 2.0 2016-11-17 20:55:42 -06:00
terrafrost
df4ed58401 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-11-17 20:54:56 -06:00
terrafrost
99a2127856 Hash: fix E_NOTICE with PHP4-style constructor 2016-11-17 20:54:38 -06:00
terrafrost
272ae9c64c Merge branch 'master' into pkcs18-rewrite 2016-11-17 08:10:55 -06:00
terrafrost
863ff6789b RSA: refactor PKCS1/PKCS8 to facilitate re-use 2016-11-17 08:09:10 -06:00
terrafrost
66aef4874a Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-11-08 09:51:59 -06:00
terrafrost
49c002d2c5 Merge branch '2.0' 2016-11-08 09:43:16 -06:00
terrafrost
c76b1aa709 Merge branch '1.0' into 2.0 2016-11-08 09:43:09 -06:00
terrafrost
71ab996806 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-11-08 09:42:38 -06:00
terrafrost
2d2bf2990e Merge branch '2.0' 2016-11-08 09:23:53 -06:00
terrafrost
a47eccf6f9 Merge branch '1.0' into 2.0 2016-11-08 09:22:05 -06:00
terrafrost
d3eb83d162 Merge branch '1.0' of https://github.com/terrafrost/phpseclib into 1.0 2016-11-08 09:12:38 -06:00
terrafrost
535104cb84 SSH2: send the identifier first, before reading it 2016-11-08 09:11:57 -06:00
terrafrost
83a6f8b788 Merge branch '2.0' 2016-11-04 02:26:08 -05:00
Łukasz Bajsarowicz
e837cc2054 Incorrect namespace hint 2016-11-04 02:25:56 -05:00
terrafrost
9d5aa56c2f README: update download link to 1.0.4 2016-10-29 13:06:22 -05:00
terrafrost
59912baef1 Merge branch '2.0' 2016-10-22 23:43:39 -05:00
terrafrost
36aa461fc3 Merge branch '1.0' into 2.0 2016-10-22 23:43:18 -05:00
terrafrost
b99345704a Merge branch '1.0-composer-lock' into 1.0 2016-10-22 23:38:39 -05:00
terrafrost
fd8f6e228d Composer: update lock file 2016-10-22 22:57:15 -05:00
terrafrost
0de3553877 Merge branch '2.0' 2016-10-22 13:11:51 -05:00
terrafrost
9e15d0c583 Merge branch '1.0' into 2.0 2016-10-22 13:11:38 -05:00
terrafrost
8d41749d9e Merge branch '2.0' 2016-10-22 13:10:38 -05:00
terrafrost
db7b8ad48f Merge branch '1.0' into 2.0 2016-10-22 13:10:21 -05:00
terrafrost
38fa7332e9 update for 1.0.5 release.. 2016-10-22 12:53:16 -05:00
terrafrost
1fb9c81233 Composer: include bootstrap before Crypt/Random 2016-10-22 11:13:01 -05:00
terrafrost
84648f17d9 Merge remote-tracking branch 'bantu/1.0-tests-bootstrap-backport' into 1.0 2016-10-22 11:11:20 -05:00
Andreas Fischer
f5d8377cdb Backport tests/bootstrap.php from 2.0 / master onto 1.0. 2016-10-20 21:30:42 +02:00
terrafrost
a478b13930 Composer: fix autoloading for 1.0 branch 2016-10-17 23:25:21 -05:00
terrafrost
b54b5b5945 Merge branch '2.0' 2016-10-04 08:59:32 -05:00
terrafrost
7bc7c8c63e Merge branch '1.0' into 2.0 2016-10-04 08:59:18 -05:00
terrafrost
d760d97fc8 CHANGELOG: add 1.0.4 release 2016-10-04 08:57:29 -05:00