3125 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
terrafrost	1e9d20364c	Merge pull request #1182 from eternalharvest/bugfix/doccomment ... Fix wrong doccomment annotation of return type	2017-09-30 08:07:06 +01:00
terrafrost	af6048b48e	AsymmetricKey: visibility fixes	2017-09-30 07:58:07 +01:00
PCF	e598a027b8	fixup! TestCase for BadConfigurationException in BigInteger	2017-09-30 03:23:39 +02:00
PCF	43803c6872	Catch BadConfigurationException in BigInteger	2017-09-30 02:47:00 +02:00
PCF	c12ffe0b37	TestCase for BadConfigurationException in BigInteger	2017-09-30 02:46:49 +02:00
terrafrost	fc6a97083c	Merge branch '2.0'	2017-09-29 21:34:51 +01:00
Martijn Smit	b3add4491d	Replace extension_loaded with forward compatible function exists check	2017-09-29 21:33:57 +01:00
Takuya Sawada	5a87cc525f	fix wrong doccomment annotation of return type	2017-09-18 02:23:14 +09:00
Sokolovskyy Roman	c6020a4c42	Unit tests fixes. ... A PHPDoc fix	2017-09-14 09:42:37 +02:00
Sokolovskyy Roman	508f04fab8	date format fix	2017-09-11 13:33:43 +02:00
Sokolovskyy Roman	4f399d5c33	Merge remote-tracking branch 'origin/master' into Bugfixes2	2017-09-11 11:13:03 +02:00
Sokolovskyy Roman	137b5dae42	Merge remote-tracking branch 'upstream/master'	2017-09-11 11:11:41 +02:00
terrafrost	761f8765fc	Merge branch '2.0'	2017-09-10 15:15:38 -05:00
terrafrost	58768cb5aa	Merge branch 'gmp-1.0' into gmp-2.0	2017-09-10 15:02:34 -05:00
terrafrost	b6d0e37432	BigInteger: use gmp_import / gmp_export when available	2017-09-10 14:56:57 -05:00
terrafrost	a2182d503f	Merge branch '2.0'	2017-09-09 20:40:25 -05:00
terrafrost	bcdb4b6c4a	Merge branch '1.0' into 2.0	2017-09-09 20:40:00 -05:00
terrafrost	76070ff5e2	README: add patreon link	2017-09-09 20:39:11 -05:00
terrafrost	1fafe157d6	SSH2: fix bad merge	2017-09-06 00:44:38 -05:00
terrafrost	e50d8ea51c	Merge branch '1.0' into ssh2-fix-multi-channel-1.0	2017-09-06 00:30:11 -05:00
terrafrost	8d16642469	Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master	2017-09-06 00:28:25 -05:00
terrafrost	74d3a51183	Merge branch 'ssh2-fix-multi-channel-1.0' into ssh2-fix-multi-channel-2.0	2017-09-06 00:27:52 -05:00
terrafrost	ed3846a7a2	Tests/SSH2: add unit test for #1167	2017-09-06 00:27:07 -05:00
terrafrost	ac19043c8b	Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master	2017-09-05 23:42:05 -05:00
terrafrost	eeaef39827	Merge branch 'ssh2-fix-multi-channel-1.0' into 2.0	2017-09-05 23:22:09 -05:00
terrafrost	932419c7e9	Revert "Composer: update lock file" ... This reverts commit 5e843160db.	2017-09-05 23:06:39 -05:00
terrafrost	cfdb122ff0	Merge branch '2.0'	2017-09-05 22:52:46 -05:00
terrafrost	a445f1480f	Merge branch '1.0' into 2.0	2017-09-05 22:52:32 -05:00
terrafrost	fa82c4efdc	Travis: update version of parallel	2017-09-05 22:42:06 -05:00
terrafrost	9228d7b5c9	Merge branch '2.0'	2017-09-05 22:00:45 -05:00
terrafrost	a7eb9099f1	Merge branch '1.0' into 2.0	2017-09-05 22:00:35 -05:00
terrafrost	deb485c0e1	SFTP: fix put() with remote file stream resource (#1177)	2017-09-05 21:59:51 -05:00
terrafrost	5e843160db	Composer: update lock file	2017-08-29 22:45:31 -05:00
terrafrost	9f7a925bf4	Composer: update deps	2017-08-29 22:42:24 -05:00
terrafrost	ee3fd38682	SSH2: fix typo in comment found by Iewa	2017-08-29 07:42:51 -05:00
terrafrost	a3325d102e	SSH2: don't choke when getting response from diff channel in exec()	2017-08-29 00:17:48 -05:00
terrafrost	f257fceabb	Merge branch '2.0'	2017-08-28 23:32:19 -05:00
terrafrost	df1a650485	Merge branch '1.0' into 2.0	2017-08-28 23:31:51 -05:00
terrafrost	4b1102de7e	X509: updates to DateTime integration	2017-08-28 23:29:03 -05:00
terrafrost	ae210871e3	Merge branch '2.0'	2017-08-28 22:45:18 -05:00
terrafrost	e669624ef5	Merge branch '1.0' into 2.0	2017-08-28 22:45:09 -05:00
terrafrost	c7e67721a2	SSH2: CS adjustment	2017-08-28 22:44:58 -05:00
terrafrost	ee5172ece5	Merge branch 'arcfour256-fix-2.0'	2017-08-27 12:33:19 -05:00
terrafrost	c4be683936	Merge branch 'arcfour256-fix-1.0' into 2.0	2017-08-27 02:43:31 -05:00
terrafrost	e5b4eef91f	SSH2: workaround for bad arcfour256 implementations	2017-08-26 20:17:59 -05:00
terrafrost	143d28bafa	Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0	2017-08-25 00:13:32 -05:00
terrafrost	b27655a262	Merge branch '2.0'	2017-08-24 23:56:08 -05:00
terrafrost	4202f653ef	Merge branch '1.0' into 2.0	2017-08-24 23:55:27 -05:00
terrafrost	9cbfd23cb6	SSH2: assume any SSH server >= 1.99 supports SSH2	2017-08-24 23:52:27 -05:00
terrafrost	c43ebe3a0a	Merge branch 'datetime-2.0' into datetime-master	2017-08-24 12:50:47 -05:00