Commit Graph

3524 Commits

Author SHA1 Message Date
terrafrost
01340054a5 Merge branch '3.0' 2019-10-05 19:57:04 -05:00
terrafrost
7cbeb7df48 Merge branch '2.0' into 3.0 2019-10-05 19:56:57 -05:00
terrafrost
cf8a7ef715 Merge branch '1.0' into 2.0 2019-10-05 19:56:28 -05:00
terrafrost
cafe42ae95
Merge pull request #1417 from bantu/remove-broken-coverage
Remove obsolete code coverage upload solution.
2019-10-05 19:53:22 -05:00
Andreas Fischer
e37b7a7e48 Remove obsolete code coverage upload solution. 2019-10-05 09:43:08 +02:00
terrafrost
5ff9e7b48b Merge branch '3.0' 2019-09-28 13:05:50 -05:00
terrafrost
bd534c9271 Merge branch '2.0' into 3.0 2019-09-28 13:05:42 -05:00
terrafrost
d8b8275282 Merge branch '1.0' into 2.0 2019-09-28 13:03:14 -05:00
terrafrost
a34a4edac5 SSH2: arcfour128 / arcfour256 was being included twice 2019-09-28 12:57:33 -05:00
terrafrost
62770de289 Merge branch '3.0' 2019-09-28 08:34:30 -05:00
terrafrost
ce4722ade0 Merge branch '2.0' into 3.0 2019-09-28 08:34:18 -05:00
terrafrost
55d74d7f99 Merge branch '1.0' into 2.0 2019-09-28 08:34:02 -05:00
terrafrost
ee2ac9f818 SSH2: rm code that is never called 2019-09-28 08:32:32 -05:00
terrafrost
070ed06d1e Merge branch '3.0' 2019-09-24 22:21:26 -05:00
terrafrost
72fe2540ab readd visibility for 3.0 branch 2019-09-24 22:21:07 -05:00
terrafrost
52203748de Merge branch '2.0' into 3.0 2019-09-24 22:20:39 -05:00
terrafrost
c00a199484 Merge branch '1.0' into 2.0 2019-09-24 22:20:26 -05:00
terrafrost
d26850e56f SSH2: fix PHP4 compatability issue 2019-09-24 22:18:01 -05:00
terrafrost
4ee40bf58e Merge branch '3.0' 2019-09-22 10:39:36 -05:00
terrafrost
470c79056b Merge branch '2.0' into 3.0 2019-09-22 10:39:23 -05:00
terrafrost
367138aee7 Merge branch '1.0' into 2.0 2019-09-22 10:38:48 -05:00
terrafrost
e73f1ec910 fix PHP4 compatibility issue 2019-09-22 10:30:58 -05:00
terrafrost
53e4418a95 Merge branch '3.0' 2019-09-18 08:51:18 -05:00
terrafrost
666cde2b11 Merge branch '2.0' into 3.0 2019-09-18 08:46:54 -05:00
terrafrost
4027717852 Merge branch '1.0' into 2.0 2019-09-18 08:42:47 -05:00
terrafrost
497900643f Merge branch '3.0' 2019-09-18 08:26:32 -05:00
terrafrost
c14557ec8b SSH2: fix typo in exception 2019-09-18 08:26:07 -05:00
terrafrost
11532ba414 X509: fix pre-5.4 compatability issues 2019-09-18 08:20:33 -05:00
terrafrost
06217429a2 Travis: add PHP 5.3 support 2019-09-18 08:04:16 -05:00
Remi Collet
17610d105c fix tests for 5.3 2019-09-18 08:03:35 -05:00
Vladmir Gaydamaka
05bf34860d Added test SFTPWrongServerTest 2019-09-18 07:54:01 -05:00
terrafrost
f1e2b6e7ef SSH2: fix typo in exception 2019-09-16 23:31:46 -05:00
terrafrost
2fee8e22c1 Merge branch '2.0' into 3.0 2019-09-16 23:12:19 -05:00
terrafrost
dc075281ba Merge branch '1.0' into 2.0 2019-09-16 23:12:11 -05:00
terrafrost
ec1fcfe648 1.0.18 release 2019-09-16 23:11:10 -05:00
terrafrost
67a83ca7c8 Merge branch '2.0' into 3.0 2019-09-16 22:41:42 -05:00
terrafrost
c78eb5058d CHANGELOG: add 2.0.23 release 2019-09-16 22:41:22 -05:00
terrafrost
3af5d3b530 Merge branch '2.0' into 3.0 2019-09-16 20:08:58 -05:00
terrafrost
5c12d5460f Merge branch '1.0' into 2.0 2019-09-16 20:08:49 -05:00
Jamiel
05ea3eafb8 #1405 2019-09-16 23:04:07 +02:00
terrafrost
0952908f70 Merge branch '1.0' into 2.0 2019-09-16 07:56:14 -05:00
terrafrost
cd21287ebc SSH2: only do fclose($this->fsock) if doing so won't yield error 2019-09-16 07:55:47 -05:00
terrafrost
45d787a578
Merge pull request #1403 from terrafrost/hmac-additions
add new HMAC algorithms
2019-09-16 07:41:54 -05:00
terrafrost
853649320b Merge branch '2.0' 2019-09-15 18:24:00 -05:00
terrafrost
30ae777ef6 Merge branch '1.0' into 2.0 2019-09-15 18:23:49 -05:00
terrafrost
db324e5d01 1.0.17 release 2019-09-15 18:22:55 -05:00
terrafrost
0c06e24ac5 Merge branch '2.0' 2019-09-15 17:48:59 -05:00
terrafrost
cbddb5244e CHANGELOG: add 2.0.22 release 2019-09-15 17:48:44 -05:00
terrafrost
677a15c122 Merge branch '2.0' 2019-09-15 17:31:53 -05:00
terrafrost
bd6dbd0695 Merge branch '1.0' into 2.0 2019-09-15 17:20:11 -05:00