Commit Graph

2548 Commits

Author SHA1 Message Date
Andreas Fischer
00325a3050 Merge branch '1.0' into 2.0
* 1.0:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
43bbe485cc Merge pull request #1078 from bantu/readme-polishing
README: Fix typos.

* bantu/readme-polishing:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
a0e6bd87f2 README: Fix typos. 2016-12-25 16:09:17 +01: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
f74ba2c581 Merge branch '1.0' into 2.0 2016-12-24 19:49:30 -06:00
terrafrost
a4ac7c99a7 Merge branch 'readme-polishing' into 1.0 2016-12-24 19:14:43 -06:00
Andreas Fischer
c7390e26f5 README: Reword 1.0 PEAR installation instructions. 2016-12-18 11:08:04 +01:00
Andreas Fischer
804cade3c0 README: Add branches section. 2016-12-18 11:02:41 +01:00
Andreas Fischer
bd5b8809e8 README: Merge 'Installing Development Dependencies' into 'Contributing'. 2016-12-18 10:40:25 +01:00
Andreas Fischer
d0d26cd29f README: Remove pipe into php. 2016-12-18 10:38:28 +01:00
Andreas Fischer
3cebd4ec59 README: Update Coverage and API URLs. 2016-12-18 10:32:35 +01:00
terrafrost
da6e5211df X509: ignore certificate transparency extension 2016-12-17 17:41:56 -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
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
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
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
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
f981310266 Merge branch '1.0' into 2.0 2016-11-19 20:39:58 -06:00
terrafrost
b70cb87641 SFTP: don't delete directory if $path is empty 2016-11-19 20:39:05 -06:00
terrafrost
51bafdebe2 SFTP: CS adjustment 2016-11-18 20:48:01 -06:00
terrafrost
8b4208ee60 SFTP: logging didn't work correctly in 2.0 branch 2016-11-18 20:37:08 -06:00
terrafrost
f9f95af921 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2016-11-17 22:18:47 -06:00
terrafrost
76f6c59244 Merge branch '1.0' into 2.0 2016-11-17 20:55:42 -06:00
terrafrost
df4ed58401 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-11-17 20:54:56 -06:00
terrafrost
99a2127856 Hash: fix E_NOTICE with PHP4-style constructor 2016-11-17 20:54:38 -06:00
terrafrost
c76b1aa709 Merge branch '1.0' into 2.0 2016-11-08 09:43:09 -06:00
terrafrost
71ab996806 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-11-08 09:42:38 -06:00
terrafrost
a47eccf6f9 Merge branch '1.0' into 2.0 2016-11-08 09:22:05 -06:00
terrafrost
d3eb83d162 Merge branch '1.0' of https://github.com/terrafrost/phpseclib into 1.0 2016-11-08 09:12:38 -06:00
terrafrost
535104cb84 SSH2: send the identifier first, before reading it 2016-11-08 09:11:57 -06:00
Łukasz Bajsarowicz
e837cc2054 Incorrect namespace hint 2016-11-04 02:25:56 -05:00
terrafrost
36aa461fc3 Merge branch '1.0' into 2.0 2016-10-22 23:43:18 -05:00
terrafrost
b99345704a Merge branch '1.0-composer-lock' into 1.0 2016-10-22 23:38:39 -05:00
terrafrost
fd8f6e228d Composer: update lock file 2016-10-22 22:57:15 -05:00
terrafrost
9e15d0c583 Merge branch '1.0' into 2.0 2016-10-22 13:11:38 -05:00
terrafrost
38fa7332e9 update for 1.0.5 release.. 2016-10-22 12:53:16 -05:00
terrafrost
1fb9c81233 Composer: include bootstrap before Crypt/Random 2016-10-22 11:13:01 -05:00
terrafrost
84648f17d9 Merge remote-tracking branch 'bantu/1.0-tests-bootstrap-backport' into 1.0 2016-10-22 11:11:20 -05:00
Andreas Fischer
f5d8377cdb Backport tests/bootstrap.php from 2.0 / master onto 1.0. 2016-10-20 21:30:42 +02:00
terrafrost
a478b13930 Composer: fix autoloading for 1.0 branch 2016-10-17 23:25:21 -05:00
terrafrost
7bc7c8c63e Merge branch '1.0' into 2.0 2016-10-04 08:59:18 -05:00