Andreas Fischer
563b8af6ce
Merge branch 'master' into php5
...
* master:
SSH2: rm redundant part of SSH2 unit test
SSH2: add unit test for getServerPublicHostKey
SSH2: make it so you can verify server public host key without logging on
2014-06-17 11:37:37 +02:00
terrafrost
5f56781261
SSH2: make it so you can verify server public host key without logging on
2014-06-16 10:19:34 -05:00
Andreas Fischer
67aedc240b
Change constructors from class name to __construct().
...
This has been produced as follows:
<?php
$replace = $files = [];
$it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($argv[1]));
foreach ($it as $fileinfo) {
if ($fileinfo->getExtension() === 'php') {
$file = $fileinfo->getPathname();
$content = file_get_contents($file);
$files[$file] = $content;
$tokens = token_get_all($content);
foreach ($tokens as $key => $value) {
if ($value[0] === T_CLASS) {
$class = $tokens[$key + 2][1];
$replace += array(
"$class::$class(" => "$class::__construct(",
"parent::$class(" => "parent::__construct(",
"function $class(" => "function __construct(",
);
}
}
}
}
foreach ($files as $file => $content) {
file_put_contents(
$file,
str_replace(
array_keys($replace),
array_values($replace),
$content
)
);
}
2014-06-16 17:06:34 +02:00
Andreas Fischer
14ba37c539
Merge branch 'master' into php5
...
* master:
SSH2: make $mac_algorithms non-static
2014-06-11 07:49:02 +02:00
terrafrost
246e9e154f
SSH2: make $mac_algorithms non-static
...
none of the other statically defined variables have the potential
to change as multiple Net_SSH2 objects are created but this one does.
ie. if you connect to one SSH-2.0-SSHD server then no subsequent server
will use hmac-sha1-96 even if it could
2014-06-10 23:08:56 -05:00
Andreas Fischer
f40bc4d3b8
Merge branch 'master' into php5
...
* master:
SFTP: update one last comment
SFTP: update unit test comments
SFTP: add new line to end of unit test
SFTP: assertEquals -> assertSame
SFTP: reset sort options every time and update unit test
SFTP: rm whitespace
SFTP: define $sortOptions
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-09 20:19:39 +02:00
terrafrost
0e2b2a416b
SFTP: reset sort options every time and update unit test
2014-06-09 09:22:30 -05:00
terrafrost
8dff207ed3
SFTP: rm whitespace
2014-06-05 15:06:50 -05:00
terrafrost
8c0f710083
SFTP: define $sortOptions
2014-06-05 10:50:13 -05:00
terrafrost
b64573f4b5
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-05 09:56:49 -05:00
Andreas Fischer
f2f5fcd70a
Update users of Math_BigInteger.
2014-06-02 20:19:00 +02:00
Andreas Fischer
6f4a873cad
Merge branch 'master' into php5
...
* master:
Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:24 +02:00
Andreas Fischer
e6f87318f5
Adjust documentation to coding guidelines: No () around include.
2014-06-01 23:28:49 +02:00
Andreas Fischer
7e2289656a
Merge branch 'master' into php5
...
* master:
SFTP/Stream: fix capatilization
SFTP/Stream: add explanation as to why nlist() is used here
SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:05 +02:00
terrafrost
7252017268
SFTP/Stream: fix capatilization
2014-05-29 16:49:04 -05:00
terrafrost
c0e3795319
SFTP/Stream: add explanation as to why nlist() is used here
2014-05-29 16:23:28 -05:00
terrafrost
3dd92e56e4
SFTP/Stream: use $scheme instead of 'sftp'
...
This makes it easier for someone to change the scheme (which can be
done by changng the stream_wrapper_register call at the bottom
of the file)
2014-05-29 16:14:03 -05:00
Andreas Fischer
712f820a26
Merge branch 'master' into php5
...
* master:
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
aa5f9b77ec
Merge pull request #349 from terrafrost/ssh2-exec-callback-termination
...
SSH2: make it so callback functions can make exec() return early
* terrafrost/ssh2-exec-callback-termination:
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
5ff1c9a349
Merge branch 'master' into php5
...
* master:
SFTP: NULL -> null
SFTP: fix syntax error
SFTP: add more stat functions
2014-05-28 00:02:23 +02:00
terrafrost
db32efb276
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
2014-05-26 17:57:14 -05:00
terrafrost
0dd929341b
SSH2: make it so callback functions can make exec() return early
2014-05-26 17:37:32 -05:00
terrafrost
c100264b65
SFTP: NULL -> null
2014-05-26 16:32:57 -05:00
terrafrost
46ae0da314
SFTP: fix syntax error
2014-05-26 15:42:14 -05:00
terrafrost
a7fa4cc4ff
SFTP: add more stat functions
...
also don't use stat cache for SFTP/Stream.php
2014-05-26 15:39:30 -05:00
Andreas Fischer
518eb861e9
Merge branch 'master' into php5
...
* master:
SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
f1fbf9c5ae
SFTP: Use the correct stat cache property: stat_cache
2014-05-22 13:32:39 +02:00
Andreas Fischer
39b9ffffdf
Merge branch 'master' into php5
...
* master:
SFTP: last commit had a few ommissions
SFTP Functional tests: Make use of assertNotSame
SFTP Functional tests: Keep story linear.
SFTP: add more unit tests
2014-05-22 13:25:57 +02:00
terrafrost
1ddcd6d873
SFTP: last commit had a few ommissions
2014-05-21 19:55:12 -05:00
Andreas Fischer
4524b9f663
Merge branch 'master' into php5
...
* master:
SFTP: stat cache updates
SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().
2014-05-21 17:55:42 +02:00
terrafrost
4d9214970b
SFTP: stat cache updates
2014-05-21 10:20:36 -05:00
Andreas Fischer
6b2b01347f
Merge branch 'master' into php5
...
* master:
SFTP: use_cache -> use_stat_cache
SFTP: switch from using file existence cache to stat cache, like PHP
SFTP: add support for recursive nlist and rawlist
SFTP: add file_exists, is_dir and is_file functions
2014-05-18 23:21:17 +02:00
terrafrost
36fa9e4e48
SFTP: use_cache -> use_stat_cache
2014-05-18 15:55:12 -05:00
terrafrost
e09a6968da
SFTP: switch from using file existence cache to stat cache, like PHP
...
also add a few new functions - is_link and filesize
2014-05-18 15:34:10 -05:00
terrafrost
0a0398268a
SFTP: add support for recursive nlist and rawlist
2014-05-13 17:10:32 -05:00
terrafrost
77641003fa
SFTP: add file_exists, is_dir and is_file functions
...
also expand caching layer
2014-05-10 19:52:38 -05:00
Andreas Fischer
b3081f2a61
Merge branch 'master' into php5
...
* master:
SSH2: improve handling of incomplete packets
2014-04-19 15:46:56 +02:00
terrafrost
efd3b96dc8
SSH2: improve handling of incomplete packets
2014-04-18 16:58:00 -05:00
Andreas Fischer
a7da467819
Merge branch 'master' into php5
...
* master:
Added some simple Net_SSH2 tests
2014-04-18 16:55:42 +02:00
Andreas Fischer
b676cc2690
Merge pull request #241 from mpscholten/ssh2-tests
...
Added some simple Net_SSH2 tests
* mpscholten/ssh2-tests:
Added some simple Net_SSH2 tests
Conflicts:
tests/Net/SSH2Test.php
2014-04-18 16:54:24 +02:00
Andreas Fischer
58cdf692f8
Merge branch 'master' into php5
...
* master:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
Conflicts:
phpseclib/Net/SSH2.php
2014-04-10 18:00:38 +02:00
terrafrost
79719e8f74
SSH2: move _connect() call to _login() from login()
...
Per bantu, this is required for it to work with Net/SFTP.php
2014-04-08 08:48:12 -05:00
terrafrost
0ad0bb4c37
SSH2: phpdoc updates
2014-04-07 15:43:31 -05:00
terrafrost
677a291cb3
SSH: clarify role of constructor / connection timeout
...
Also, in Net_SSH2::_connect() $host is used in multiple places. Rather than changing all references to {$this->host}:{$this->port} preserve existing $host reference and update it accordingly
2014-04-07 10:26:46 -05:00
terrafrost
24bb941799
SSH1: do fsockopen() call when login has been called
2014-04-07 00:30:50 -05:00
terrafrost
6fcfe5c885
SSH2: != -> |=
2014-04-07 00:25:38 -05:00
terrafrost
8f08301744
SSH2: phpdoc changes
2014-04-07 00:19:35 -05:00
terrafrost
ab341df973
SSH2: syntax error
2014-04-07 00:16:54 -05:00
terrafrost
f27a49299e
SSH2: timeout set in constructor != timeout set by setTimeout()
2014-04-07 00:02:03 -05:00
terrafrost
fc748346fc
SSH2: add phpdoc header
2014-04-06 23:56:21 -05:00