Commit Graph

3093 Commits

Author SHA1 Message Date
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
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
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
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
terrafrost
e81b31948b Merge branch '1.0' into 2.0 2020-09-28 06:20:16 -05:00
terrafrost
96c4c3bc58 SSH2: add setKeepAlive() method 2020-09-28 06:17:49 -05:00
William Desportes
05f6467b1d
Merge branch '1.0' into 2.0 2020-09-09 09:56:23 +02:00
William Desportes
2ae683479a
Fix phpdoc errors 2020-09-09 09:43:26 +02:00
terrafrost
497856a8d9 add 2.0.29 release 2020-09-07 23:24:43 -05:00
terrafrost
734d728c75 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2020-08-31 05:14:36 -05:00
terrafrost
2e9d5a99c7 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2020-08-31 05:13:38 -05:00
terrafrost
604b94d011 Merge branch '1.0' into 2.0 2020-08-30 08:22:13 -05:00
terrafrost
f4e017f383 SFTP: "fix" rare resource not closed error 2020-08-30 08:21:50 -05:00
Andreas Fischer
a25d4980f1 Merge branch '1.0' into 2.0
* 1.0:
  Remove api from build target
2020-08-21 19:35:49 +02:00
Andreas Fischer
cee2ffc064 Merge pull request #1515 from code-lts/1.0-build
Remove api from build target

* github.com:phpseclib/phpseclib:
  Remove api from build target
2020-08-21 19:35:48 +02:00
William Desportes
3fe698e9ae
Remove api from build target 2020-08-21 18:46:51 +02:00
Andreas Fischer
901382d724 Merge branch '1.0' into 2.0
* 1.0:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:19:41 +02:00
Andreas Fischer
de49d701b0 Merge pull request #1513 from code-lts/master
Move Doctum config files to phpseclib/api-docs

* github.com:phpseclib/phpseclib:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:18:32 +02:00
William Desportes
ceab38e0b8
Move Doctum config files to phpseclib/api-docs
Fixes: #1365
Closes: #416
Closes: #1506
2020-08-21 18:06:03 +02:00
terrafrost
f0710fc77e Merge branch '1.0' into 2.0 2020-08-17 07:29:12 -05:00
terrafrost
ded9b3043f SSH2: suppress 'broken pipe' errors 2020-08-17 07:28:17 -05:00
terrafrost
ed20bba5e7 Merge branch '1.0' into 2.0 2020-08-09 11:00:49 -05:00
terrafrost
239bc63618 SSH2: uploads on low speed networks could get in infinite loop 2020-08-09 11:00:12 -05:00
terrafrost
0747be3d27 Merge branch '1.0' into 2.0 2020-08-01 04:06:57 -05:00
terrafrost
a019cf3f33
Merge pull request #1503 from VincentLanglet/default
_parseKey should return false by default
2020-08-01 04:05:17 -05:00
terrafrost
5369b86808 Merge branch '1.0' into 2.0 2020-07-31 08:06:58 -05:00
terrafrost
40b4f1d557 SSH2: when building algo list look at if crypto engine is set 2020-07-31 08:05:31 -05:00
terrafrost
4eb477051c Merge branch '1.0' into 2.0 2020-07-31 02:50:00 -05:00
terrafrost
c7d7b36018 SSH2: don't try to login as none auth method for CoreFTP server 2020-07-31 02:49:21 -05:00
terrafrost
82406869fb Merge branch '1.0' into 2.0 2020-07-30 22:58:56 -05:00
terrafrost
ea653e1b01 SFTP: add enableDatePreservation() / disableDatePreservation() 2020-07-30 09:12:23 -05:00
Vincent Langlet
05a564c136 Return false by default 2020-07-30 15:42:02 +02:00
terrafrost
64708aed3b Merge branch '1.0' into 2.0 2020-07-17 07:54:02 -05:00
terrafrost
d077c7b296 X509: really looong base64 encoded strings broke extractBER() 2020-07-17 07:53:05 -05:00
terrafrost
d1ca58cf33 CHANGELOG: there already was a 2.0.27 release.. 2020-07-08 04:08:33 -05:00
terrafrost
f0fc371a2a 2.0.27 release 2020-07-08 04:05:48 -05:00
terrafrost
c89cd789f4 Merge branch '1.0' into 2.0 2020-07-07 23:47:41 -05:00
terrafrost
d8e39b0864 SFTP: change upload packet size from 4KB to 32KB 2020-07-07 23:47:17 -05:00
terrafrost
6a13b52d80 Merge branch '1.0' into 2.0 2020-07-07 23:35:07 -05:00
terrafrost
6537e74746 1.0.19 release 2020-07-07 23:31:58 -05:00
terrafrost
51f2a9386b Merge branch 'timeout-alt-2.0' into 2.0 2020-05-31 12:22:35 -05:00
terrafrost
cc3ad79058 Crypt/Base: create_function isn't needed for PHP >= 5.3.0 2020-05-29 08:34:40 -05:00
terrafrost
ee278f3062 Merge branch 'timeout-alt-1.0' into timeout-alt-2.0 2020-05-29 08:10:36 -05:00
terrafrost
9651d075e3 SSH2: timeout after 5s for channel closures 2020-05-29 08:10:03 -05:00
terrafrost
ceaffa8fa9 Merge branch '1.0' into 2.0 2020-05-10 23:52:20 -05:00