1999 Commits

Author	SHA1	Message	Date
terrafrost	fabb42c20d	Merge branch '2.0'	2017-09-30 22:56:43 +01:00
terrafrost	836d452acd	Merge branch '1.0' into 2.0	2017-09-30 22:56:32 +01:00
terrafrost	6f47ef808e	X509: fix issues when using datetime without a timezone set in ini	2017-09-30 22:54:33 +01:00
terrafrost	1f7d1bc18a	Revert "date format fix" ... This reverts commit 508f04fab8.	2017-09-30 22:50:24 +01:00
terrafrost	4f2ece4d7d	Merge remote-tracking branch 'rrran/Bugfixes2'	2017-09-30 22:50:06 +01:00
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	43803c6872	Catch BadConfigurationException in BigInteger	2017-09-30 02:47:00 +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
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	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	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	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	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
terrafrost	221a9be8e6	Merge branch 'datetime-1.0' into datetime-2.0	2017-08-24 12:50:00 -05:00
terrafrost	09c17b1a31	ASN1 / X509: update to use DateTime instead of unix time	2017-08-24 12:48:15 -05:00
Sokolovskyy Roman	25c1ae6e00	Merge remote-tracking branch 'origin/master' into Bugfixes2	2017-08-09 12:28:02 +02:00
terrafrost	04fce0b39b	Merge branch '2.0'	2017-08-08 22:04:59 -05:00
terrafrost	a4c79db37a	Merge branch '1.0' into 2.0	2017-08-08 21:53:07 -05:00
terrafrost	5c792f6bc1	ANSI: fix E_NOTICE when overflowing text overflows screen vertical	2017-08-08 21:44:22 -05:00
terrafrost	9d8f014748	SymmetricKey: isValidKey took ints instead of strings	2017-08-07 23:57:02 -05:00
terrafrost	e7e30cd239	BigInteger: undo visibility changes	2017-08-07 22:38:56 -05:00
terrafrost	3fcce89f78	Merge remote-tracking branch 'rrran/Bugfixes'	2017-08-07 21:47:06 -05:00
terrafrost	93a3139475	Merge branch 'pre-1157-changes'	2017-08-07 21:46:28 -05:00
terrafrost	520c56a797	Merge branch 'send-kex-and-id-first-or-last-2.0'	2017-08-07 20:09:26 -05:00
terrafrost	dfb6770891	Merge branch 'send-kex-and-id-first-or-last-1.0' into 2.0	2017-08-07 18:37:11 -05:00
terrafrost	7ccb0d0b02	SSH2: send KEXINIT packet and identification string first or last	2017-08-07 00:34:58 -05:00
terrafrost	9f540a82e6	minor fixes to X509 and SSH2	2017-08-06 17:29:30 -05:00
terrafrost	0ac8b5d5ed	ASN1: rm unused method (decodeLength)	2017-08-06 10:30:29 -05:00
Sokolovskyy Roman	55cacdf7cd	More PHPDOC fixes	2017-08-04 12:06:25 +02:00
Sokolovskyy Roman	eb21fb2bcb	Default value for a parameter missed	2017-08-03 11:25:20 +02:00
Sokolovskyy Roman	de2e4662b0	Fixed wrong use of new self(1);	2017-08-03 09:26:46 +02:00
Sokolovskyy Roman	7bffa6bb8f	Set of PHPDOC fixes	2017-08-03 09:26:09 +02:00
Sokolovskyy Roman	6f36c49baa	Fixed methods visibility	2017-08-03 09:20:33 +02:00
Sokolovskyy Roman	d13f429b77	PHPDOC fixes	2017-08-03 09:20:17 +02:00
Sokolovskyy Roman	f314f9795f	Fixed methods visibility	2017-08-03 09:20:05 +02:00
Sokolovskyy Roman	0fd58aeb7e	Set of PHPDOC fixes ... Fixed methods visibility	2017-08-03 09:19:11 +02:00
Sokolovskyy Roman	ccfb6c92bf	Set of PHPDOC fixes	2017-08-03 09:16:37 +02:00
Sokolovskyy Roman	6181b2bfbd	Set of PHPDOC fixes	2017-08-03 09:16:16 +02:00
Sokolovskyy Roman	5583703040	Set of PHPDOC fixes	2017-08-03 09:15:16 +02:00
Sokolovskyy Roman	a3b252150b	Set of PHPDOC fixes	2017-08-03 09:14:32 +02:00
Sokolovskyy Roman	f48995ac96	Wrong class name fix ... PHPDOC fixes	2017-08-03 09:13:44 +02:00
Sokolovskyy Roman	0c6d8607ce	added missing use statement ... PHPDOC fix	2017-08-03 09:12:56 +02:00
Sokolovskyy Roman	5fe61b325d	PHPDOC fix	2017-08-03 09:12:07 +02:00
Sokolovskyy Roman	167718a046	Set of PHPDOC fixes	2017-08-03 09:11:44 +02:00
terrafrost	bf537059b1	Merge branch '2.0'	2017-07-30 16:20:38 -05:00
terrafrost	f68a85e99b	SSH1: backport fixes from rrran	2017-07-30 16:19:23 -05:00
terrafrost	4a7d3d27ba	DSA/Signatures/SSH2: self generated signatures wouldn't verify	2017-07-30 16:03:47 -05:00
terrafrost	610d3d6ea0	Merge remote-tracking branch 'rrran/Bugfixes'	2017-07-30 15:58:12 -05:00
terrafrost	c5a73e948f	Merge branch '2.0'	2017-07-30 10:18:41 -05:00
terrafrost	6922e6d476	Merge branch '1.0' into 2.0	2017-07-30 10:18:31 -05:00
Yannick Breuer	acebfe28d6	DOC: Fix sftp errors var type	2017-07-30 10:18:08 -05:00
Sokolovskyy Roman	3df0f7ccb4	Added missing break in case (reverted from commit 31d9cf3015)	2017-07-20 14:56:54 +02:00
Sokolovskyy Roman	800b81d3ef	remove unneeded strlen call	2017-07-20 11:36:51 +02:00
Sokolovskyy Roman	65d9e2bb49	Added missin break ... removed return statement	2017-07-20 11:35:08 +02:00
Sokolovskyy Roman	cc3f0c1ec1	Added missing private field	2017-07-20 11:10:06 +02:00
Sokolovskyy Roman	c603c2b2d0	Remove unused use ... Fix in PHPDoc block Wrong variable name fix	2017-07-20 11:09:29 +02:00
Sokolovskyy Roman	7a25abe60a	PHPDoc fix ... Using property instead of method call fix	2017-07-20 11:08:03 +02:00
Sokolovskyy Roman	654bb1a704	Function setVar should not retun a value	2017-07-20 11:03:26 +02:00
Sokolovskyy Roman	31d9cf3015	Added missing break in case	2017-07-20 11:02:26 +02:00
Sokolovskyy Roman	0178d4f56e	Fix: Local variable to property ... Fix: Constants names	2017-07-20 11:01:47 +02:00
terrafrost	669a7542ea	Merge branch '2.0'	2017-07-16 11:32:15 -05:00
terrafrost	de18148e80	Merge branch '1.0' into 2.0	2017-07-16 11:32:04 -05:00
terrafrost	84d1628cb7	ANSI: make it so x position can't be negative	2017-07-16 11:31:25 -05:00
terrafrost	7ef3864d22	RSA: RSAKeyValue -> RSAKeyPair for XML private keys	2017-06-28 23:19:50 -05:00
terrafrost	b46bedbdf7	SymmetricKey: use static::class instead of getClassContext() method	2017-06-28 07:34:51 -05:00
terrafrost	4171262b9e	SymmetricKey: use strings for constructor and setPreferredEngine	2017-06-28 06:54:10 -05:00
terrafrost	819a165246	RSA: add enableBlinding() / disableBlinding() static methods	2017-06-26 23:19:30 -05:00
terrafrost	1630a6710d	RSA/DSA: support XML keys with XML declarations	2017-06-26 21:58:20 -05:00
terrafrost	62a8047fa1	Hash: use hash extension for sha512/224 & sha512/256 on PHP 7.1+	2017-06-26 21:45:29 -05:00
terrafrost	5fe629a171	BigInteger: modularize / modernize class and add new powmod engines	2017-06-26 20:07:10 -05:00
Matej Kravjar	47c419545a	Fixed #632 Fatal error: Cannot access self:: when no class scope is active	2017-06-20 12:43:42 +02:00
terrafrost	0bbac3ebed	Merge branch '2.0'	2017-06-19 22:37:21 -05:00
terrafrost	3cbb9516ef	Merge branch '1.0' into 2.0	2017-06-19 22:35:22 -05:00
terrafrost	b6eb7b2009	Merge branch '2.0'	2017-06-19 22:34:28 -05:00
terrafrost	9814140055	Merge branch '1.0' into 2.0	2017-06-19 22:34:20 -05:00
Moritz Kornher	7606f81279	Add new mode READ_NEXT to only ready the next packet from the channel.	2017-06-19 22:33:08 -05:00
terrafrost	8ea3edf0d2	Merge branch '2.0'	2017-06-12 22:37:06 -05:00
terrafrost	9d0c924cbd	Merge branch '1.0' into 2.0	2017-06-12 22:36:58 -05:00
Sidney Souza	4d36e67bee	Fix Invalid HMAC for D-link DES-3028 ... When I tried connect to a dlink switch the Net_SSH2 does not choose the correct algorithms for hmac causing an Invalid HMAC error. However, after I commented the line 1280 everything work magnificently	2017-06-12 22:36:30 -05:00
terrafrost	03ca09a104	Merge branch '2.0'	2017-06-12 21:26:20 -05:00
terrafrost	53acccdb08	Merge branch '1.0' into 2.0	2017-06-12 21:19:18 -05:00
David Hedberg	bbf467babd	SFTP: Add enablePathCanonicalization()/disablePathCanonicalization()	2017-06-12 21:17:55 -05:00
terrafrost	0bb6c9b974	SFTP: rm NO_REALPATH changes	2017-06-05 01:30:30 -05:00
terrafrost	1564a27f6e	SFTP: make NO_REALPATH apply to get() as well	2017-06-05 00:44:29 -05:00
David Hedberg	5979ed571f	SFTP: Add a NO_REALPATH option to put()	2017-06-05 00:12:57 -05:00
terrafrost	6ca7323401	Merge branch '2.0'	2017-05-29 06:33:24 -05:00
terrafrost	a4cd384bab	Merge branch '1.0' into 2.0	2017-05-29 06:32:23 -05:00
terrafrost	a451dd69f8	RSA: reset variables if bad key was loaded	2017-05-29 06:31:54 -05:00
terrafrost	e9d21367fa	Merge branch '1.0' into 2.0	2017-05-28 09:57:45 -05:00
terrafrost	228b60cfe5	Random: suppress E_DEPRECATED errors	2017-05-28 09:53:02 -05:00
terrafrost	a312a1d4f0	SSH2: update a few function calls to work with renamed methods	2017-05-28 09:44:38 -05:00
terrafrost	c25eb3ed9b	Merge branch 'master-crypt-fix-old-openssl'	2017-05-14 15:35:22 -05:00
terrafrost	83514e3991	Merge pull request #1127 from terrafrost/crypt-fix-old-openssl ... Crypt: fix OpenSSL engine on <= PHP 5.3.6 (1.0 branch)	2017-05-14 15:34:22 -05:00
terrafrost	ae41ac1ac3	Merge pull request #1128 from terrafrost/2.0-crypt-fix-old-openssl ... Crypt: fix OpenSSL engine on <= PHP 5.3.6 (2.0 branch)	2017-05-14 15:34:16 -05:00
terrafrost	baeb68eb82	Merge branch '2.0'	2017-05-14 08:50:57 -05:00
terrafrost	4b24877a2c	Merge branch '1.0' into 2.0	2017-05-14 08:50:13 -05:00
terrafrost	19c71e4a98	X509: include subjectaltname extension even if only one domain name	2017-05-14 08:49:04 -05:00
terrafrost	085d5ed495	Merge branch '2.0-crypt-fix-old-openssl'	2017-05-13 23:24:53 -05:00
terrafrost	9fc9d2fa19	Merge branch 'crypt-fix-old-openssl' into 2.0	2017-05-13 23:21:14 -05:00
terrafrost	a983412ea9	Crypt: fix OpenSSL engine on <= PHP 5.3.6	2017-05-13 23:18:42 -05:00
terrafrost	5c51c2570c	Merge branch '2.0'	2017-05-11 07:33:55 -05:00
Remi Collet	9706f37644	fix permission	2017-05-08 17:23:20 +02:00
terrafrost	31f4406b6e	Merge branch 'master' of https://github.com/phpseclib/phpseclib	2017-05-07 15:08:36 -05:00
terrafrost	84d40ad8e0	Merge branch '2.0'	2017-05-07 13:26:39 -05:00
terrafrost	64dd2e064b	Merge branch '1.0' into 2.0	2017-05-07 13:26:27 -05:00
terrafrost	35a1102c0b	SFTP: fix put() with php://input as source	2017-05-07 13:25:43 -05:00
Casper Langemeijer	4a0118bae6	Refactor create_function() into anonymous function	2017-04-17 15:35:00 +02:00
terrafrost	4a069f7c85	rm redundant files	2017-04-15 19:35:07 -05:00
terrafrost	4058e3e217	Merge pull request #1090 from terrafrost/dsa-test-2 ... add DSA implementation	2017-04-15 15:49:04 -05:00
terrafrost	0a6fe37285	Merge branch '2.0'	2017-04-09 10:30:23 -05:00
terrafrost	f4ae2cf3d3	Merge branch '1.0' into 2.0	2017-04-09 10:23:20 -05:00
Moritz Fain	7fd1eefd66	Fixed ASN.1 UTCTime parsing	2017-04-09 10:15:40 -05:00
terrafrost	22bf2339d7	Merge branch '2.0'	2017-03-07 22:20:21 -06:00
terrafrost	52dcabb279	Merge pull request #1104 from metaclassing/fix-array-map-namespace ... namespacing the array_map function	2017-03-07 21:50:41 -06:00
Metaclassing	42a7ff61ff	namespacing the array_map function	2017-03-07 15:22:44 -06:00
terrafrost	9cbf357ac5	Merge branch '2.0'	2017-03-01 22:27:31 -06:00
terrafrost	ecb92ad25c	Merge branch '1.0' into 2.0	2017-03-01 22:27:00 -06:00
terrafrost	8abc0ee60c	SSH2: include <pre> tags in getLog result when SAPI isn't CLI	2017-03-01 22:26:29 -06:00
terrafrost	9f4f288005	Merge branch '1.0' into 2.0	2017-03-01 22:24:59 -06:00
terrafrost	b8ceb96bd4	SSH2: include <pre> tags in getLog result when SAPI isn't CLI	2017-03-01 22:18:38 -06:00
terrafrost	42def63b00	Merge remote-tracking branch 'upstream/master' into dsa-test-2	2017-02-02 21:07:47 -05:00
terrafrost	ab1da5ac1f	Merge pull request #1084 from terrafrost/php5-updates ... PHP5 updates for master branch	2017-02-02 21:03:07 -05:00
terrafrost	eb459daeaf	add DSA implementation	2017-02-02 20:20:47 -05:00
terrafrost	7d2e44b430	Merge branch '2.0'	2017-01-27 12:40:23 -06:00
terrafrost	ac2b7ef76c	Merge branch '1.0' into 2.0	2017-01-27 12:17:04 -06:00
terrafrost	1bde98fc42	Crypt: OpenSSL apparently supports variable size keys	2017-01-27 11:20:22 -06:00
terrafrost	8e44671766	visibility fixes	2017-01-21 15:51:49 -06:00
terrafrost	a25c841108	Merge remote-tracking branch 'upstream/master' into php5-updates	2017-01-17 22:40:24 -06:00
terrafrost	b9b4f67a0f	Net: add public / private / protected	2017-01-17 10:23:28 -06:00
terrafrost	fae358cc3c	BigInteger: use public / private / protected	2017-01-05 00:20:18 -06:00
terrafrost	c8c61055d1	Merge branch '2.0'	2016-12-24 21:34:30 -06:00
terrafrost	95335f9560	SSH2: update PTY changes for 2.0 branch	2016-12-24 21:20:13 -06:00
terrafrost	6aa31b2cd1	Merge branch '1.0' into 2.0	2016-12-24 21:10:50 -06:00
terrafrost	785b477605	Merge branch 'pty-enhancement' into 1.0	2016-12-24 20:28:19 -06:00
terrafrost	68b5a8896f	Merge branch '2.0'	2016-12-24 20:06:51 -06:00
terrafrost	f74ba2c581	Merge branch '1.0' into 2.0	2016-12-24 19:49:30 -06:00
terrafrost	da6e5211df	X509: ignore certificate transparency extension	2016-12-17 17:41:56 -06:00
terrafrost	2a7c99ef1b	...	2016-12-17 17:22:11 -06:00
terrafrost	a72a168400	Merge branch '1.0' into 2.0	2016-12-17 17:03:08 -06:00
vladimirghetau	d80794b1d9	exec authentication, code reuse	2016-12-17 16:37:04 -06:00
terrafrost	b26f14e5fe	SSH2: make it so disabling PTY closes exec() channel if it's open	2016-12-17 16:09:48 -06:00
terrafrost	9ae5206588	RSA: setEngine -> setPreferredEngine (make it like SymmetricKey)	2016-12-11 09:59:50 -06:00
terrafrost	242e0dcb7f	Files: add public / protected / private	2016-12-11 08:23:59 -06:00
terrafrost	e6e34f3543	Merge pull request #1065 from terrafrost/asn1-revamp-pt3 ... ASN.1 revamp	2016-12-10 19:27:37 -06:00
terrafrost	1dfd315725	RSA: use public / private / protected	2016-12-10 19:09:54 -06:00
terrafrost	813b85b5b2	Crypt: define visibility for more variables / methods	2016-12-09 16:46:01 -06:00
terrafrost	067c1882e5	SymmetricCiphers: rm some redundant methods / variables	2016-12-09 15:51:31 -06:00
terrafrost	d34a911402	SymmetricCiphers: don't cache "hi-optimized code" ... Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL had three different modes - a "hi-optimized" version, a "lo-optimized" version and a version that didn't depend on create_function and there wasn't a way to really isolate these modes and test them individually.	2016-12-08 09:20:19 -06:00
terrafrost	2a1177b256	SymmetricCiphers: add public / private / protected as appropriate	2016-12-07 22:19:20 -06:00
terrafrost	496fb80020	Strings: make this an abstract class as well	2016-11-30 21:43:03 -06:00
terrafrost	c852bae3c8	use short array syntax for arrays	2016-11-30 21:29:38 -06:00
terrafrost	7182ec393b	make classes with only static methods abstract	2016-11-30 09:25:04 -06:00
terrafrost	72a6aab872	Merge branch 'master' of https://github.com/phpseclib/phpseclib	2016-11-29 23:18:44 -06:00
terrafrost	e34e5f5135	Merge branch '2.0'	2016-11-29 23:00:03 -06:00
terrafrost	024ac81d04	Merge branch '1.0' into 2.0	2016-11-29 19:26:11 -06:00
terrafrost	d0cb855bbc	Merge branch '1.0-suppress-unpack-errors' into 1.0	2016-11-29 19:16:16 -06:00
terrafrost	81bae5ce8b	Merge pull request #1061 from terrafrost/pkcs18-rewrite ... RSA: refactor PKCS1/PKCS8 to facilitate re-use	2016-11-29 19:15:21 -06:00
terrafrost	a4d05f8445	ASN1: rm an alternative approach for dealing with ASN1\Element	2016-11-29 08:15:08 -06:00
terrafrost	4dc3b7ed43	ASN1: don't return false after exception is thrown	2016-11-28 22:40:55 -06:00
terrafrost	370fbec300	ASN1: don't require octet / bit strings be base64-encoded	2016-11-28 20:51:21 -06:00
terrafrost	874ada8d93	ASN1: make methods static	2016-11-27 22:38:11 -06:00
terrafrost	df6d55fd97	ASN1: move ASN1 maps to external files for reuse	2016-11-22 23:56:07 -06:00
terrafrost	865904f636	Merge branch '2.0'	2016-11-20 18:13:48 -06:00
terrafrost	de3bb2e300	Merge branch '1.0' into 2.0	2016-11-20 18:13:41 -06:00
terrafrost	6fb34887c5	SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M)	2016-11-20 18:13:01 -06:00
terrafrost	ad03dcad1c	Merge branch '2.0'	2016-11-20 18:05:02 -06:00
terrafrost	27a6b6362a	Merge branch '1.0' into 2.0	2016-11-20 18:04:55 -06:00
terrafrost	a2d9622bf9	SFTP: update directory deletion check (#1059)	2016-11-20 18:03:01 -06:00
terrafrost	6807791d42	Merge branch '2.0'	2016-11-20 11:14:48 -06:00
terrafrost	abf3899e1f	Merge branch '1.0' into 2.0	2016-11-20 11:14:35 -06:00
terrafrost	7cb66ea56e	SSH2: don't use timeout value of 0 for fsockopen	2016-11-20 11:08:53 -06:00
terrafrost	48cf16599b	suppress unpack() PHP warnings	2016-11-19 22:39:36 -06:00
terrafrost	b8e1a15291	Merge branch '2.0'	2016-11-19 20:40:04 -06:00
terrafrost	f981310266	Merge branch '1.0' into 2.0	2016-11-19 20:39:58 -06:00