cd5e5126ca
SFTP: CS adjustment
2021-03-16 06:18:19 -05:00
906a5fafab
Added some PHPDoc fixes according to use cases from the docs ( https://phpseclib.com/docs/sftp ) to satisfy PHPStan
2021-03-10 07:58:31 -06:00
70bc5d01f0
Merge branch '2.0' into 3.0
2021-03-08 23:04:28 -06:00
cf8d62500b
Merge branch '1.0' into 2.0
2021-03-08 23:04:21 -06:00
a45ccbacb7
SFTP: digit only filenames were converted to integers by php
2021-03-08 23:03:38 -06:00
7b7d254a6c
rm docblock templates
2020-12-30 09:08:05 -06:00
a19b5b4ca8
update how @internal phpdoc attributes are used
2020-12-30 05:05:54 -06:00
f5d7c06264
Merge branch '2.0' into 3.0
2020-12-19 01:12:16 -06:00
c680c604c8
Merge branch '1.0' into 2.0
2020-12-19 01:07:08 -06:00
c21147a5bd
SFTP: clean up real time logging
2020-12-19 01:05:36 -06:00
31c5e50902
SFTP: change where stat cache is being cleared for uploads
2020-12-19 01:02:06 -06:00
08478feee7
SFTP: resuming uploads didn't work
2020-12-18 17:31:55 -06:00
afca3030c0
Merge branch '2.0' into 3.0
2020-11-26 21:09:21 -06:00
1ec3efa04b
Merge branch '1.0' into 2.0
2020-11-26 21:09:17 -06:00
0b20aff6ff
SFTP: CS adjustments
2020-11-26 21:08:49 -06:00
b310f694ef
Merge branch '2.0' into 3.0
2020-11-26 19:10:48 -06:00
bf03b0302b
Merge branch '1.0' into 2.0
2020-11-26 19:10:39 -06:00
9547587cb7
SFTP: add stream to get method
2020-11-26 18:56:02 -06:00
7e337c9bd7
Merge branch '2.0' into 3.0
2020-11-01 09:31:17 -06:00
e18880009b
Merge branch '1.0' into 2.0
2020-10-31 15:15:06 -05:00
b2ae60f0a9
$progressCallback should be called after a specific amount of data has been received and not, if its just requested, as the requested packets might be more as the available and received data.
2020-10-31 15:05:05 -05:00
480af6b980
Merge branch '2.0' into 3.0
2020-09-09 10:46:22 +02:00
05f6467b1d
Merge branch '1.0' into 2.0
2020-09-09 09:56:23 +02:00
2ae683479a
Fix phpdoc errors
2020-09-09 09:43:26 +02:00
fc4a1b0083
Merge branch '2.0' into 3.0
2020-08-30 08:22:20 -05:00
604b94d011
Merge branch '1.0' into 2.0
2020-08-30 08:22:13 -05:00
f4e017f383
SFTP: "fix" rare resource not closed error
2020-08-30 08:21:50 -05:00
8f62b798ef
Merge branch '2.0' into 3.0
2020-08-09 11:00:57 -05:00
ed20bba5e7
Merge branch '1.0' into 2.0
2020-08-09 11:00:49 -05:00
239bc63618
SSH2: uploads on low speed networks could get in infinite loop
2020-08-09 11:00:12 -05:00
abe8f6aab8
Merge branch '2.0' into 3.0
2020-07-30 22:59:13 -05:00
82406869fb
Merge branch '1.0' into 2.0
2020-07-30 22:58:56 -05:00
ea653e1b01
SFTP: add enableDatePreservation() / disableDatePreservation()
2020-07-30 09:12:23 -05:00
9e81c7e257
Merge branch '2.0' into 3.0
2020-07-07 23:47:47 -05:00
c89cd789f4
Merge branch '1.0' into 2.0
2020-07-07 23:47:41 -05:00
d8e39b0864
SFTP: change upload packet size from 4KB to 32KB
2020-07-07 23:47:17 -05:00
85d55164a6
Merge branch '2.0' into 3.0
2020-05-10 23:52:28 -05:00
ceaffa8fa9
Merge branch '1.0' into 2.0
2020-05-10 23:52:20 -05:00
ef9785d9c5
SFTP: if /path/to/file is a file then /path/to/file/whatever errors
2020-05-10 23:51:16 -05:00
4af7ca4c09
Merge branch '2.0' into 3.0
2020-05-01 21:36:02 -05:00
2a6fc5695c
Merge branch '1.0' into 2.0
2020-05-01 21:35:53 -05:00
a07f5bc6a2
SFTP: realpath('') produced an error
2020-05-01 21:34:44 -05:00
ceff4cfbbc
rm call_user_func() calls
2020-04-05 15:04:22 -05:00
9c0ad2f1f4
SFTP: optimize call to parent login method for 2.0 branch
2020-04-04 12:49:56 -05:00
e02b93443c
Merge branch '1.0' into 2.0
2020-04-04 12:49:41 -05:00
c301ddf38f
SFTP: make it so extending SFTP class doesn't cause a segfault
2020-04-04 12:47:30 -05:00
542bb6cca1
Merge branch '2.0' into 3.0
2020-03-30 07:36:43 -05:00
7e67f882ee
Merge branch '1.0-mkdir-mode-adjustment' into 2.0-mkdir-mode-adjustment
2020-03-28 18:05:49 -05:00
5e2951f83a
SFTP: change the mode with a SETSTAT instead of MKDIR
2020-03-28 18:04:26 -05:00
ef04a176dd
Merge branch '2.0' into 3.0
2020-03-09 20:02:17 -05:00
63a76e88a1
Merge branch '1.0' into 2.0
2020-03-09 19:49:37 -05:00
229f6af1ca
SFTP: re-use SSH2 login method
2020-03-09 19:49:20 -05:00
053e856a47
Merge branch '2.0-speed-up-uploads' into 3.0-speed-up-uploads
2020-02-25 20:45:18 -06:00
a563ee6704
Merge branch '1.0-speed-up-uploads' into 2.0-speed-up-uploads
2020-02-25 20:42:32 -06:00
08e4096e7c
SFTP: speed up uploads
2020-02-25 20:37:20 -06:00
8c8e805c73
Merge branch '2.0' into 3.0
2020-02-25 00:00:25 -06:00
c18159618e
Merge branch '1.0' into 2.0
2020-02-24 22:16:50 -06:00
db6ce986f3
Revert "SFTP: don't buffer up download requests (PuTTY doesn't)"
...
This reverts commit 333e2e4c2b
2020-02-24 22:14:28 -06:00
8dac275a03
SFTP: rm size() (we already have filesize())
2020-02-11 23:25:04 -06:00
b95120c808
SFTP: change visibility of sortOptions for phpseclib2_compat
2020-02-11 06:29:21 -06:00
f8685c0577
SFTP: _get_sftp_packet() -> get_sftp_packet()
2020-02-10 21:09:22 -06:00
f44d39fb19
SFTP: rm permissions attribute
2020-02-10 21:05:00 -06:00
be221d8b23
Merge branch '2.0' into 3.0
2019-12-25 17:49:03 -06:00
de4a60de9d
Merge branch '1.0' into 2.0
2019-12-25 17:36:31 -06:00
333e2e4c2b
SFTP: don't buffer up download requests (PuTTY doesn't)
2019-12-25 11:31:43 -06:00
653dbd7f94
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-11-21 19:38:03 -06:00
69a11136ae
SSH2: ping tweaks
2019-09-10 19:52:35 -05:00
71aa8165fa
Merge branch '2.0'
2019-09-10 18:13:12 -05:00
2cf180fb47
Merge branch '1.0' into 2.0
2019-09-10 17:43:41 -05:00
fbf36728fd
SSH2 / SFTP: fix issues with ping()
2019-09-10 17:31:43 -05:00
b89c488f43
SFTP: unpack() -> unpackSSH2()
2019-08-22 05:01:33 -05:00
e71f203742
Merge branch 'master-callback'
2019-06-16 15:31:39 -05:00
82454229f6
Merge branch '2.0-callback' into 2.0
2019-06-16 15:31:31 -05:00
f8d8ad24fd
Merge branch '1.0-callback' into 1.0
2019-06-16 15:31:22 -05:00
aa8a30cd81
Merge branch '2.0'
2019-06-16 11:04:31 -05:00
0932fb3054
Merge branch '1.0' into 2.0
2019-06-16 11:03:37 -05:00
a7d038830c
fix array_merge(): Argument #1 is not an array
2019-06-16 11:03:27 -05:00
30320f5a91
Merge branch '2.0-callback' into master-callback
2019-06-02 08:22:26 -05:00
a0fa38db6d
Merge branch '1.0-callback' into 2.0-callback
2019-06-02 08:20:07 -05:00
e988abcdb1
SFTP: add callback parameter to get()
2019-06-02 08:19:41 -05:00
79f925e43c
SFTP: replace user_error() with Exceptions
2019-05-28 08:52:53 -05:00
72b4bf74d2
SFTP: use microtime(true)
2019-05-28 08:50:22 -05:00
a773ae80bd
Merge branch '2.0'
2019-05-28 08:47:59 -05:00
06ccf5d1f9
Merge branch '1.0' into 2.0
2019-05-28 08:47:51 -05:00
8df35cc368
SFTP: improve handling of malformed packets
2019-05-28 08:47:34 -05:00
cee3f3cd4a
SFTP: use Strings::packSSH2() / Strings::unpackSSH2()
2019-04-03 22:09:15 -05:00
d329814f55
SSH2: send_binary_packet() now always throws exceptions on error
2019-03-31 00:33:57 -05:00
8ce392f218
SFTP: nlist() didn't return empty directories - now it does
...
I view this as a BC breaking change so atm do not plan on
backporting it to 1.0/2.0. eg. now, all subdirectories have . and
.. as "files" whereas before they didn't
2019-03-16 09:41:06 -05:00
496fcd18cd
Merge branch '2.0'
2019-03-03 18:42:47 -06:00
03d9efcbc9
Merge branch '1.0' into 2.0
2019-03-03 18:40:36 -06:00
fce6063de6
SFTP: make it so get() can correctly handle out of order responses
2019-03-03 18:38:57 -06:00
bee5fd70d8
Fix invalid method name + usages in comments
2018-09-10 17:20:48 +02:00
6021e74a79
Merge branch '2.0-dsas'
2018-08-18 15:04:51 -05:00
82967a40d4
Merge branch '1.0-dsas' into 2.0
2018-08-18 15:03:25 -05:00
f7f156b537
SFTP: use lstat in rawlist instead of stat
2018-08-18 15:02:42 -05:00
426dbdbfcd
Ensure SFTP::rawlist gives same results regardless of statcache
...
Previously SFTP::rawlist gave different results depending on whether the
stat cache was enabled or not. With the stat cache turned off it did not
treat directories correctly, as it relied on the stat cache even though
it was not populated.
2018-08-18 08:36:16 -05:00
380517ef00
Misc. trivial typos
...
Found via `codespell -q 3`
2018-03-03 07:07:14 -05:00
63b6df29a8
Merge branch '2.0'
2018-02-07 21:24:51 -06:00
473c980d0c
Merge branch '1.0' into 2.0
2018-02-07 21:23:21 -06:00
1468ef1a23
SFTP: fix issue with extended attribute on 64-bit PHP installs
2018-02-07 21:22:54 -06:00
59faa1d253
Merge branch '2.0'
2018-01-01 13:09:18 -06:00
d0155508e9
Merge branch '1.0' into 2.0
2018-01-01 13:09:05 -06:00
30a11a3951
SFTP: update state cache accordingly when file becomes directory
2018-01-01 13:07:45 -06:00
56a644faa8
replace user_error with exceptions in a few more places
2017-12-23 14:32:22 -06:00
62ee1a5747
Multiline phpdoc for extract to one liner
2017-12-21 10:14:53 +01:00
c705e7d9c6
Add PhpDoc @var for extract() functions
2017-12-04 11:11:43 +01:00
2314b638c7
Merge pull request #1212 from rrran/func_get_args_to_tripple_dots
...
Get rid of func_get_args()
2017-11-23 10:02:59 -06:00
e2e719ee29
Merge branch '2.0'
2017-11-23 09:37:26 -06:00
6e9ece958b
Merge branch '1.0' into 2.0
2017-11-23 09:33:35 -06:00
309fa0af44
SSH/SFTP: more adustments to channel handling
2017-11-23 09:31:34 -06:00
ee8f5e9769
Get rid of func_get_args()
2017-11-21 09:36:28 +01:00
d90e9d1b7a
Merge pull request #1204 from comsolit/feature/show-answer-not-understood
...
Unveil received value in unexpected value exceptions (SFTP)
2017-11-05 15:16:40 -06:00
ec579bd9ed
revisions to rrran's PHPDoc changes
2017-11-05 14:35:27 -06:00
31b02fe7cc
Unveil received value in unexpected value exceptions (SFTP)
2017-11-02 14:36:22 +01:00
f40ea062c2
Lots of PHPDoc fixes
2017-10-25 11:44:14 +02:00
4f399d5c33
Merge remote-tracking branch 'origin/master' into Bugfixes2
2017-09-11 11:13:03 +02:00
9228d7b5c9
Merge branch '2.0'
2017-09-05 22:00:45 -05:00
a7eb9099f1
Merge branch '1.0' into 2.0
2017-09-05 22:00:35 -05:00
deb485c0e1
SFTP: fix put() with remote file stream resource ( #1177 )
2017-09-05 21:59:51 -05:00
55cacdf7cd
More PHPDOC fixes
2017-08-04 12:06:25 +02:00
0fd58aeb7e
Set of PHPDOC fixes
...
Fixed methods visibility
2017-08-03 09:19:11 +02:00
c5a73e948f
Merge branch '2.0'
2017-07-30 10:18:41 -05:00
6922e6d476
Merge branch '1.0' into 2.0
2017-07-30 10:18:31 -05:00
acebfe28d6
DOC: Fix sftp errors var type
2017-07-30 10:18:08 -05:00
03ca09a104
Merge branch '2.0'
2017-06-12 21:26:20 -05:00
53acccdb08
Merge branch '1.0' into 2.0
2017-06-12 21:19:18 -05:00
bbf467babd
SFTP: Add enablePathCanonicalization()/disablePathCanonicalization()
2017-06-12 21:17:55 -05:00
0bb6c9b974
SFTP: rm NO_REALPATH changes
2017-06-05 01:30:30 -05:00
1564a27f6e
SFTP: make NO_REALPATH apply to get() as well
2017-06-05 00:44:29 -05:00
5979ed571f
SFTP: Add a NO_REALPATH option to put()
2017-06-05 00:12:57 -05:00
84d40ad8e0
Merge branch '2.0'
2017-05-07 13:26:39 -05:00
64dd2e064b
Merge branch '1.0' into 2.0
2017-05-07 13:26:27 -05:00
35a1102c0b
SFTP: fix put() with php://input as source
2017-05-07 13:25:43 -05:00
a25c841108
Merge remote-tracking branch 'upstream/master' into php5-updates
2017-01-17 22:40:24 -06:00
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06:00
e34e5f5135
Merge branch '2.0'
2016-11-29 23:00:03 -06:00
024ac81d04
Merge branch '1.0' into 2.0
2016-11-29 19:26:11 -06:00
d0cb855bbc
Merge branch '1.0-suppress-unpack-errors' into 1.0
2016-11-29 19:16:16 -06:00
865904f636
Merge branch '2.0'
2016-11-20 18:13:48 -06:00
de3bb2e300
Merge branch '1.0' into 2.0
2016-11-20 18:13:41 -06:00
6fb34887c5
SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M)
2016-11-20 18:13:01 -06:00
ad03dcad1c
Merge branch '2.0'
2016-11-20 18:05:02 -06:00
27a6b6362a
Merge branch '1.0' into 2.0
2016-11-20 18:04:55 -06:00
a2d9622bf9
SFTP: update directory deletion check ( #1059 )
2016-11-20 18:03:01 -06:00
48cf16599b
suppress unpack() PHP warnings
2016-11-19 22:39:36 -06:00
b8e1a15291
Merge branch '2.0'
2016-11-19 20:40:04 -06:00
f981310266
Merge branch '1.0' into 2.0
2016-11-19 20:39:58 -06:00
b70cb87641
SFTP: don't delete directory if $path is empty
2016-11-19 20:39:05 -06:00
d1fa327ef9
Merge branch '2.0'
2016-11-18 20:48:18 -06:00
51bafdebe2
SFTP: CS adjustment
2016-11-18 20:48:01 -06:00
d6bf2b4f73
Merge branch '2.0'
2016-11-18 20:37:26 -06:00
8b4208ee60
SFTP: logging didn't work correctly in 2.0 branch
2016-11-18 20:37:08 -06:00
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
c1d407d7cf
Merge branch '1.0' into 2.0
2016-09-11 21:22:53 -07:00
ff7bc85a8f
SFTP: backport "parallel" upload code from master branch
2016-09-11 21:11:52 -07:00
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
6f22a957c2
Merge branch '2.0'
2016-08-28 23:17:11 -05:00
f30f8045fd
Merge branch '1.0' into 2.0
2016-08-28 23:17:06 -05:00
1eda62913a
Handle empty fread return correctly which resolves zero-byte file issues
2016-08-28 23:16:53 -05:00
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
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
f7585d99d1
Merge branch '2.0'
2016-07-10 13:22:09 -05:00
a21f3e5132
Merge branch '1.0' into 2.0
2016-07-10 13:22:03 -05:00
cb4a6df10c
SFTP: make symlink support relative target's
2016-07-10 13:11:24 -05:00
15f0c3e5e6
Merge branch '2.0'
2016-06-19 19:45:08 -05:00
eeb65b2341
Merge branch '1.0' into 2.0
2016-06-19 19:45:00 -05:00
6c8affcf11
fixed sending stream resulting in a zero byte file
2016-06-19 19:44:06 -05:00
adcbecae78
Use paragonie/constant_time_encoding
2016-05-21 12:57:53 -05:00
c784d9e1e5
reapply PR #931
2016-05-08 01:34:37 -05:00
43d68c6619
Merge branch '2.0'
2016-05-06 12:23:35 -05:00
700338beed
Merge branch '1.0' into 2.0
2016-05-06 11:58:07 -05:00
e762b0dc29
SFTP: add is_writable, is_writeable and is_readable
2016-05-05 16:41:15 -05:00
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
b3171cc63f
SFTP: fix logging constants
2016-04-11 19:30:45 -05:00
076c69fa1b
Merge branch '1.0' into 2.0
2016-04-11 15:18:50 -05:00
d22bcd63cc
SFTP: nlist() on a non-existent directory resulted in error
2016-04-11 15:18:06 -05:00
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
6d5ec59f10
SFTP: a few tweaks to the queue'd get() changes raxbg did
2016-03-14 09:57:54 -05:00
75d4c3b09c
Even more memory optimizations
2016-02-25 13:55:49 +02:00
1af19fbf1b
Fix a memory leak when transferring lots of small files
2016-02-24 17:01:40 +02:00
56af770943
Changes based on comment 187537999
2016-02-23 19:21:23 +02:00
83b8d0ec0a
Bug fix for SFTP::get()
2016-02-17 14:57:32 +02:00
11a539bcbd
Implement parallel download
2016-02-11 16:38:31 +02:00
cd700ce8b3
Merge branch '2.0'
2016-01-25 16:58:48 -06:00
bdc28b9453
Cherry-picking cleanup of `use` operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
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
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
b67c690498
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:05:02 +02:00
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
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
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
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
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
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
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
Ernest Lebedev
Adrian
Thomas A. Hirsch
William Desportes
terrafrost
Rubens Matrono
Jakub Chábek
Dean Sas
luz.paz
Sokolovskyy Roman
Peter Bittner
Yannick Breuer
David Hedberg
Michel Bardelmeijer
klemens
Mathieu Pipet
Paragon Initiative Enterprises
Ivailo Hristov
Joey3000
Andreas Fischer
Bob4ever