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
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
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
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -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
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
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
terrafrost
b70cb87641
SFTP: don't delete directory if $path is empty
2016-11-19 20:39:05 -06:00
terrafrost
d1fa327ef9
Merge branch '2.0'
2016-11-18 20:48:18 -06:00
terrafrost
51bafdebe2
SFTP: CS adjustment
2016-11-18 20:48:01 -06:00
terrafrost
d6bf2b4f73
Merge branch '2.0'
2016-11-18 20:37:26 -06:00
terrafrost
8b4208ee60
SFTP: logging didn't work correctly in 2.0 branch
2016-11-18 20:37:08 -06:00
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
c1d407d7cf
Merge branch '1.0' into 2.0
2016-09-11 21:22:53 -07:00
terrafrost
ff7bc85a8f
SFTP: backport "parallel" upload code from master branch
2016-09-11 21:11:52 -07:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
6f22a957c2
Merge branch '2.0'
2016-08-28 23:17:11 -05:00
terrafrost
f30f8045fd
Merge branch '1.0' into 2.0
2016-08-28 23:17:06 -05:00
Michel Bardelmeijer
1eda62913a
Handle empty fread return correctly which resolves zero-byte file issues
2016-08-28 23:16:53 -05:00
klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
f7585d99d1
Merge branch '2.0'
2016-07-10 13:22:09 -05:00
terrafrost
a21f3e5132
Merge branch '1.0' into 2.0
2016-07-10 13:22:03 -05:00
terrafrost
cb4a6df10c
SFTP: make symlink support relative target's
2016-07-10 13:11:24 -05:00
terrafrost
15f0c3e5e6
Merge branch '2.0'
2016-06-19 19:45:08 -05:00
terrafrost
eeb65b2341
Merge branch '1.0' into 2.0
2016-06-19 19:45:00 -05:00
Mathieu Pipet
6c8affcf11
fixed sending stream resulting in a zero byte file
2016-06-19 19:44:06 -05:00
Paragon Initiative Enterprises
adcbecae78
Use paragonie/constant_time_encoding
2016-05-21 12:57:53 -05:00
terrafrost
c784d9e1e5
reapply PR #931
2016-05-08 01:34:37 -05:00
terrafrost
43d68c6619
Merge branch '2.0'
2016-05-06 12:23:35 -05:00
terrafrost
700338beed
Merge branch '1.0' into 2.0
2016-05-06 11:58:07 -05:00