terrafrost
c460e511a0
SFTP: update how recursive delete's update stat cache
2015-07-04 13:09:26 -05:00
terrafrost
109ae38e48
SFTP: don't update stat cache when it's been disabled
2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1
Merge pull request #713 from bantu/SFTPStreamTest
...
[1.0] Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758
Merge pull request #713 from bantu/SFTPStreamTest
...
Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
Conflicts:
tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
e1dd7e9d69
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
1ad66ad1ea
Merge pull request #719 from terrafrost/lstat-fix-1.0
...
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch
* terrafrost/lstat-fix-1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
89cf423c58
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
terrafrost
d1d415618a
SFTP: update conditions under which cache for lstat / . is used
2015-06-26 23:34:14 -05:00
Andreas Fischer
d71da6b02b
Explicitly set size to 0 when creating or truncating.
2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b
mode[0] of 'c' is not supposed to truncate.
2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1
Need to create the file when it does not exist and mode[0] is not 'r'.
2015-06-25 14:24:18 +02:00
terrafrost
c0555581e7
SSH2: fix for window sizes > 2,147,483,648
2015-06-24 23:45:14 -05:00
terrafrost
4d82df3fc7
Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0
...
Conflicts:
tests/Functional/Net/SFTPUserStoryTest.php
2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914
SFTP: stat cache updates
2015-06-20 19:33:19 -05:00
terrafrost
ab98a7c30c
Merge branch 'booleans-1.0' into booleans-2.0
...
Conflicts:
README.md
2015-05-07 00:29:33 -05:00
terrafrost
2fee2d4f98
backport e3betht's PR to 1.0
2015-05-07 00:26:39 -05:00
Andreas Fischer
8e2f694129
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: string shift by 4 instead of by 1
SSH2: fix E_NOTICE involving global requests
2015-05-05 16:14:12 +02:00
Andreas Fischer
5bd7a73a71
Merge pull request #674 from terrafrost/ssh2-global-request
...
fix E_NOTICE with SSH2 global requests
* terrafrost/ssh2-global-request:
SSH2: string shift by 4 instead of by 1
SSH2: fix E_NOTICE involving global requests
2015-05-05 16:14:12 +02:00
terrafrost
684d6eed0e
SSH2: string shift by 4 instead of by 1
2015-05-04 08:22:27 -05:00
Andreas Fischer
661f3ce3b9
Merge branch '1.0' into 2.0
...
* 1.0:
Replace ; with : in case statement.
Conflicts:
phpseclib/Net/SFTP.php
phpseclib/Net/SSH2.php
2015-05-03 14:13:56 +02:00
Andreas Fischer
5d2590feb0
Replace ; with : in case statement.
2015-05-03 13:18:23 +02:00
Andreas Fischer
daaa931dc2
Merge branch '1.0' into 2.0
...
* 1.0:
callbacks - two PRs conflict sorted out. First one: e9b698fd65075273ec11a1ffae3ebeccaad6e086, fba6894474b767fcacb2dc25cae1508107b417be, 1cd286642ef6ceb5a0c2405799f68798eb20470e Second one: 16430d4d2e77e257c26b3a00542faefa56b2454e, 0cc6125f8795f577aa9e01535c1a58545e290866
documentation fix
Conflicts:
phpseclib/Net/SFTP.php
2015-05-03 01:10:53 +02:00
andrey012
e7719f765c
callbacks - two PRs conflict sorted out.
...
First one: e9b698fd65075273ec11a1ffae3ebeccaad6e086, fba6894474b767fcacb2dc25cae1508107b417be, 1cd286642ef6ceb5a0c2405799f68798eb20470e
Second one: 16430d4d2e77e257c26b3a00542faefa56b2454e, 0cc6125f8795f577aa9e01535c1a58545e290866
2015-05-02 15:27:57 +03:00
andrey012
f4a93c790f
Merge branch '1.0' into sftp-put-callback-for-1.0
2015-05-02 15:24:31 +03:00
andrey012
0cc6125f87
documentation fix
2015-05-02 14:28:19 +03:00
terrafrost
b59d821bbe
SSH2: fix E_NOTICE involving global requests
2015-04-30 21:34:07 -05:00
terrafrost
36ef1c4084
Merge remote-tracking branch 'audrey/sftp-put-callback' into 2.0
2015-04-16 07:45:39 -05:00
terrafrost
1d772c3a6f
Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0
2015-04-16 07:45:24 -05:00
terrafrost
d00e20a140
Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Net/SCP.php
tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6
Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc
2015-04-16 00:31:54 -05:00
terrafrost
ca0b56f05c
Merge branch '1.0' into 2.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Net/SFTP.php
2015-04-15 23:56:09 -05:00
terrafrost
b47813cf47
Merge remote-tracking branch 'DavidAnderson84/patch-4' into 1.0
2015-04-15 23:52:00 -05:00
andrey012
26086789ef
replace throw with user_error()
2015-04-15 03:35:08 +03:00
andrey012
16430d4d2e
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-15 03:29:01 +03:00
Andrey Grinenko
b5e80bc176
cosmetics
2015-04-11 11:34:41 +03:00
terrafrost
047a75a636
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
2015-04-10 23:08:08 -05:00
terrafrost
0b1d3aa7e9
SSH2: NET_SSH2_MASK_* -> self::MASK_*
2015-04-10 17:48:58 -05:00
Andrey Grinenko
e58427221d
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-09 02:59:00 +03:00
terrafrost
d75f703c0a
rm PHP v4 compatability claim
2015-04-02 05:57:52 -05:00
terrafrost
e510dc878b
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7
Merge branch 'openssl-support' into 2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
2015-04-02 05:32:31 -05:00
Andreas Fischer
8101772ab4
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
Conflicts:
phpseclib/Net/SSH2.php
2015-03-30 12:46:54 +02:00
Andreas Fischer
c0370ee91d
Merge pull request #639 from terrafrost/banner-timeout
...
improve error handling with protocol version exchange
* terrafrost/banner-timeout:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
2015-03-30 12:37:46 +02:00
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
terrafrost
33645f5297
SSH2: missed a file in the merge
2015-03-29 10:58:05 -05:00
terrafrost
a8e702b34f
Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
terrafrost
bb01002233
Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0
2015-03-28 21:03:17 -05:00
terrafrost
1294b08675
SSH2: rm unused $connectionTimeout variable
2015-03-27 22:32:38 -05:00
montdidier
9723acc885
preference isset over array_key_exists, return false on failure, break after return channel opened
2015-03-24 13:38:56 +08:00
