3368 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
terrafrost	2b5e205aec	Merge branch 'keepalive-1.0' into 1.0	2020-12-16 23:14:49 -06:00
terrafrost	184c779d4a	Merge branch 'keepalive-1.0' into keepalive-2.0	2020-12-16 09:11:52 -06:00
terrafrost	0399faa86b	SSH2: syntax error	2020-12-16 09:10:35 -06:00
terrafrost	07a7c19407	Merge branch 'keepalive-1.0' into keepalive-2.0	2020-12-16 08:27:50 -06:00
terrafrost	8d567cdf29	SSH2: keepalive tweak	2020-12-16 08:26:03 -06:00
terrafrost	43b2708254	Merge branch 'keepalive-1.0' into keepalive-2.0	2020-12-15 23:36:42 -06:00
terrafrost	f0501ff72b	SSH2: get_binary_packet() doesn't know about channel type	2020-12-15 23:11:54 -06:00
terrafrost	d904f08a46	SSH2: last merge should have used microtime(true) but didn't	2020-12-15 08:43:21 -06:00
terrafrost	a35535e9c6	Merge branch 'keepalive-1.0' into keepalive-2.0	2020-12-15 08:39:38 -06:00
terrafrost	194e642448	SSH2: handle keepalive@openssh.com packets	2020-12-15 08:25:42 -06:00
terrafrost	61d885630f	CS adjustment	2020-12-12 22:32:46 -06:00
terrafrost	360afd93c8	fix bad merge	2020-12-12 22:15:40 -06:00
terrafrost	0676524dfd	Merge branch '1.0-class-rename' into 2.0-class-rename	2020-12-12 21:41:10 -06:00
terrafrost	e6abc61f45	rm adding of dupe classes (they break annotations)	2020-12-12 21:39:58 -06:00
terrafrost	185139f5c8	Merge branch '1.0' into 2.0	2020-12-12 17:39:38 -06:00
terrafrost	95432478c0	fix bad merge	2020-12-12 17:39:32 -06:00
terrafrost	245a84b57f	make unit tests pass without gnu parallel	2020-12-12 17:26:44 -06:00
terrafrost	5701295017	Merge branch '1.0' into 2.0	2020-12-12 17:13:41 -06:00
terrafrost	266f16816a	enable unit tests for PHP 8 / PHPUnit 9	2020-12-12 15:11:04 -06:00
terrafrost	07e1160108	Merge branch '1.0' into 2.0	2020-12-07 08:01:58 -06:00
terrafrost	ee4af462b6	SSH2: end connection faster for algorithm mismatch	2020-12-07 08:00:44 -06:00
terrafrost	1ec3efa04b	Merge branch '1.0' into 2.0	2020-11-26 21:09:17 -06:00
terrafrost	0b20aff6ff	SFTP: CS adjustments	2020-11-26 21:08:49 -06:00
terrafrost	bf03b0302b	Merge branch '1.0' into 2.0	2020-11-26 19:10:39 -06:00
Adrian	9547587cb7	SFTP: add stream to get method	2020-11-26 18:56:02 -06:00
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