terrafrost
cd700ce8b3
Merge branch '2.0'
2016-01-25 16:58:48 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
Andreas Fischer
a88047f242
Merge branch '2.0'
...
* 2.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8
Merge branch '1.0' into 2.0
...
* 1.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:07 +02:00
Bob4ever
b67c690498
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:05:02 +02:00
terrafrost
8686ced6d3
Merge branch 'phpdoc-2.0' into phpdoc-master
...
Conflicts:
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
2015-10-12 21:37:44 -05:00
terrafrost
33ea01f1ac
Merge branch 'phpdoc-1.0' into phpdoc-2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-10-12 14:10:26 -05:00
terrafrost
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
Andreas Fischer
0ba1a04c05
Merge branch '2.0'
...
* 2.0:
SFTP: don't start in local file middle when uploading to middle of the remote file
Tests/SFTP: updates to newly added unit test
SFTP: backport DavidAnderson684's changes to 1.0 branch
add unit test demo'ing issue # 830
2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1
SFTP: don't start in local file middle when uploading to middle of
...
the remote file
2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
2015-09-28 09:20:38 -05:00
terrafrost
e2a2ad8c91
SFTP: backport DavidAnderson684's changes to 1.0 branch
2015-09-27 10:56:05 -05:00
Andreas Fischer
ccd18552e5
Merge branch '2.0'
...
* 2.0:
Fixed phpdoc
Conflicts:
phpseclib/Crypt/Hash.php
2015-09-16 13:36:04 +02:00
Graham Campbell
7f1bbfe216
Fixed phpdoc
2015-09-14 16:30:31 +01:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514
Fixed invalid param phpdoc
2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
terrafrost
2a8da097ae
Merge branch 'master' into exceptions-v1
...
Conflicts:
phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
2e46aec03a
SFTP: replace user_error's with exceptions
2015-08-31 23:12:33 -05:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
4b5cc0c286
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: stat cache updates
2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5
SFTP: stat cache updates
2015-07-17 12:34:56 +02:00
Andreas Fischer
f782005a3f
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
7f1dfba50d
Merge pull request #730 from terrafrost/disable-stat-cache-1.0
...
SFTP: don't update stat cache when it's been disabled
* terrafrost/disable-stat-cache-1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
83cac3385b
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:38:10 +02:00
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
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
terrafrost
d1d415618a
SFTP: update conditions under which cache for lstat / . is used
2015-06-26 23:34: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
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: e9b698fd65fba68944741cd286642e16430d4d2e0cc6125f87
2015-05-03 01:10:53 +02:00
andrey012
e7719f765c
callbacks - two PRs conflict sorted out.
...
First one: e9b698fd65fba68944741cd286642e16430d4d2e0cc6125f87
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
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
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
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
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
