terrafrost
|
88e58c75d0
|
don't go out of our way to support < PHP 5.3
...not when phpseclib 2.0 requires PHP 5.3+
|
2016-10-02 22:07:33 -05:00 |
|
terrafrost
|
7ae4ea3e71
|
Merge branch '1.0' into 2.0
|
2016-10-02 21:56:59 -05:00 |
|
terrafrost
|
3c149e0e6a
|
Merge branch '1.0-32bit-fixes' into 1.0
|
2016-10-02 21:39:16 -05:00 |
|
terrafrost
|
42f5399960
|
Crypt/Base: fix bad merge
|
2016-10-02 08:09:54 -05:00 |
|
terrafrost
|
42fb96db16
|
fix float to int conversions on 32-bit linux PHP < 5.3 installs
|
2016-10-02 03:37:23 -05:00 |
|
terrafrost
|
3205c95177
|
Merge branch '1.0' into 2.0
|
2016-10-01 20:05:16 -05:00 |
|
terrafrost
|
0fc6c6c9f6
|
Merge branch '1.0-php71' into 1.0
|
2016-10-01 20:02:58 -05:00 |
|
terrafrost
|
e81b8d90d3
|
Travis: PHP 7.1 tweaks
|
2016-09-24 11:57:59 -05:00 |
|
terrafrost
|
d68975117c
|
RC2: rm empty constructor
|
2016-09-23 21:55:26 -05:00 |
|
terrafrost
|
640f10609f
|
fix PHP 7.1 compatibility errors
|
2016-09-21 01:21:54 -05:00 |
|
terrafrost
|
e4489a1765
|
fix PHP 7.1 compatibility errors
|
2016-09-21 01:03:26 -05:00 |
|
Thomas Müller
|
d7295e827c
|
Adding php 7.1 to travis
|
2016-09-20 18:56:58 -05:00 |
|
terrafrost
|
c1d407d7cf
|
Merge branch '1.0' into 2.0
|
2016-09-11 21:22:53 -07:00 |
|
terrafrost
|
ff7bc85a8f
|
SFTP: backport "parallel" upload code from master branch
|
2016-09-11 21:11:52 -07:00 |
|
terrafrost
|
222ad56285
|
Merge branch '1.0' into 2.0
|
2016-09-10 11:04:52 -07:00 |
|
terrafrost
|
845135f887
|
add PHP5-style constructors along side PHP4-style ones
|
2016-09-10 10:41:05 -07:00 |
|
terrafrost
|
f30f8045fd
|
Merge branch '1.0' into 2.0
|
2016-08-28 23:17:06 -05:00 |
|
Michel Bardelmeijer
|
1eda62913a
|
Handle empty fread return correctly which resolves zero-byte file issues
|
2016-08-28 23:16:53 -05:00 |
|
terrafrost
|
020bcdab29
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2016-08-28 10:48:45 -05:00 |
|
terrafrost
|
6dc50cc5c9
|
ASN1: update unit test for 2.0 branch
|
2016-08-28 10:45:31 -05:00 |
|
terrafrost
|
281cfcdcea
|
Merge branch '1.0' into 2.0
|
2016-08-28 10:45:04 -05:00 |
|
terrafrost
|
5c2ffd2544
|
ASN1: fix infinite loop during ASN1 decode process
|
2016-08-28 10:43:33 -05:00 |
|
terrafrost
|
41f85e9c25
|
Merge branch '1.0' into 2.0
|
2016-08-18 13:49:14 -05:00 |
|
terrafrost
|
c27fd2e66f
|
updates for 1.0.3 release
|
2016-08-18 13:43:04 -05:00 |
|
terrafrost
|
c20b661a44
|
SSH2: don't check for carriage return in version id string
|
2016-08-11 23:09:38 -05:00 |
|
terrafrost
|
719fb8d7a8
|
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0
|
2016-08-04 07:32:07 -05:00 |
|
terrafrost
|
e6a2ce1d6d
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2016-08-04 07:30:46 -05:00 |
|
terrafrost
|
ffdac88f17
|
Merge branch '1.0' into 2.0
|
2016-08-04 01:07:55 -05:00 |
|
terrafrost
|
12f70270cd
|
fix bad cherry pick
|
2016-08-04 01:06:52 -05:00 |
|
terrafrost
|
676c1982c7
|
fix bad merge
|
2016-08-04 01:04:00 -05:00 |
|
terrafrost
|
1a25aefa59
|
cherry-picking last commit added new file
|
2016-08-04 00:55:21 -05:00 |
|
terrafrost
|
c547ee16c7
|
Merge branch '1.0' into 2.0
|
2016-08-04 00:31:15 -05:00 |
|
klemens
|
dca95ac662
|
spelling fixes
|
2016-08-04 00:19:27 -05:00 |
|
terrafrost
|
eff01fba0e
|
RSA: update phpdoc for 2.0 branch
|
2016-07-28 11:00:16 -05:00 |
|
terrafrost
|
61d0326bb6
|
Merge branch '1.0' into 2.0
|
2016-07-28 10:59:37 -05:00 |
|
terrafrost
|
b9f072bf03
|
RSA: phpdoc updates
|
2016-07-28 10:58:27 -05:00 |
|
terrafrost
|
e59e544ed8
|
Merge branch '1.0' into 2.0
|
2016-07-23 18:55:35 -05:00 |
|
terrafrost
|
62381365c8
|
Tests/X509: make dn more generic in unit test
|
2016-07-23 18:54:25 -05:00 |
|
terrafrost
|
2c4dcd96b4
|
fix issue with merge
|
2016-07-23 18:39:25 -05:00 |
|
terrafrost
|
dbdba0b7ef
|
Merge branch '1.0' into 2.0
|
2016-07-23 18:16:52 -05:00 |
|
terrafrost
|
dc7f7e4d85
|
ASN1: fix PHP Warning on PHP 7.1
|
2016-07-23 11:01:43 -05:00 |
|
terrafrost
|
6c0575f8db
|
ASN1: update code to use 2.0-style constants
|
2016-07-20 00:17:24 -05:00 |
|
terrafrost
|
485b8e0463
|
Merge branch '1.0' into 2.0
|
2016-07-19 23:52:09 -05:00 |
|
terrafrost
|
d525aa66f2
|
ASN1: adjust ordering of SET OF values
|
2016-07-19 23:48:23 -05:00 |
|
terrafrost
|
a21f3e5132
|
Merge branch '1.0' into 2.0
|
2016-07-10 13:22:03 -05:00 |
|
terrafrost
|
cb4a6df10c
|
SFTP: make symlink support relative target's
|
2016-07-10 13:11:24 -05:00 |
|
terrafrost
|
97f0b37bd5
|
Merge branch '1.0' into 2.0
|
2016-07-10 12:55:56 -05:00 |
|
terrafrost
|
7bc0e61c1d
|
SSH2: fix "Expected SSH_FXP_STATUS or ..." error
|
2016-06-29 00:30:28 -05:00 |
|
terrafrost
|
8530cbca1a
|
Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error
|
2016-06-29 00:18:35 -05:00 |
|
terrafrost
|
17a14eceb2
|
Merge branch '1.0' into 2.0
|
2016-06-26 20:34:15 -05:00 |
|