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
terrafrost
a14e71f38b
SSH2: connect to server in login() function
...
this change will make it so some parameters can be set after the
Net_SSH2 object has been created. eg. instead of doing
define('NET_SSH2_LOGGING', NET_SSH2_LOG_COMPLEX) one can now do
$ssh->setLogging(...) or something.
2014-04-06 23:45:25 -05:00
Andreas Fischer
483b8a7d3c
Merge branch 'master' into php5
...
* master:
fix more ssh channel issues
2014-03-21 18:27:13 +01:00
terrafrost
7a2c7a414c
fix more ssh channel issues
...
In logs that were provided to me phpseclib sent a packet that was 2536 bytes long (excluding the bytes denoting the channel and data length) but the length packet said it was 32764 bytes long (ie. $max_size).
So when $max_size is less than the data being sent and has to be adjusted by a new window adjust message from the server and the adjustment makes $max_Size bigger than the data being sent over problems arise.
SSH's window size has caused issues before. Overall I don't think the SSH specs really explain the window size very well. I opened up an errata on SSH's RFC a while back about the issue.
2014-03-21 02:53:43 -05:00
Andreas Fischer
aecf89c031
Merge branch 'master' into php5
...
* master:
Drop meaningless, outdated, inconsistent version tags in doc blocks.
2014-03-13 00:03:38 +01:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Andreas Fischer
cb56e676dc
Merge branch 'master' into php5
...
* master:
Tests for bug280.
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:05:17 +01:00
Nicky Gerritsen
b5e579f6c0
Also replace this with call_user_func
2014-03-05 18:38:33 +01:00
Nicky Gerritsen
97d1e75a51
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-05 15:44:17 +01:00
Andreas Fischer
88e6eef90f
Merge branch 'master' into php5
...
* master:
Add newline at EOF to phpseclib/System/SSH_Agent.php.
SSH_Agent: phpdoc updates
SSH_Agent: misc updates
SSH2: add ssh-agent support
2014-02-21 19:42:36 +01:00
terrafrost
e90648c7a5
SSH2: add ssh-agent support
2014-02-10 00:04:16 -06:00
Andreas Fischer
addd2ac320
Merge branch 'master' into php5
...
* master:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:46 +01:00