1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 10:26:59 +01:00
Commit Graph

2838 Commits

Author SHA1 Message Date
Andreas Fischer
e191ba32ea Merge branch 'master' into php5
* master:
  Put some assertions into testStatcacheFix().
2014-07-20 22:44:42 +02:00
Andreas Fischer
884c090bf2 Merge pull request #413 from bantu/stat-cache-fix
Put some assertions into testStatcacheFix().

* bantu/stat-cache-fix:
  Put some assertions into testStatcacheFix().
2014-07-20 22:44:40 +02:00
Andreas Fischer
d29ad3afa9 Merge branch 'master' into php5
* master:
  SFTP: stat cache fixes
  SFTP: return $sftp object in new unit test method
  SFTP: add unit test for stat cache fix
2014-07-20 21:41:51 +02:00
Andreas Fischer
302f4f894b Merge pull request #409 from terrafrost/stat-cache-fix
SFTP: add unit test for stat cache fix

* terrafrost/stat-cache-fix:
  SFTP: stat cache fixes
  SFTP: return $sftp object in new unit test method
  SFTP: add unit test for stat cache fix
2014-07-20 21:41:50 +02:00
Andreas Fischer
01a176b3d3 Merge branch 'master' into php5
* master:
  Add api target to phing build script.
  Add sami configuration file.
  Add sami/sami 1.* as a development dependency.

Conflicts:
	composer.lock
2014-07-20 21:22:19 +02:00
Andreas Fischer
8796130b14 Merge pull request #410 from bantu/sami
Automated API Documenation using Sami

* bantu/sami:
  Add api target to phing build script.
  Add sami configuration file.
  Add sami/sami 1.* as a development dependency.
2014-07-20 21:20:32 +02:00
terrafrost
ac2fc96263 SSH2: make isConnected return true if even if we're not logged in 2014-07-20 11:24:16 -05:00
terrafrost
a84861bb52 SFTP: stat cache fixes 2014-07-19 21:31:58 -05:00
Andreas Fischer
ffccec59cb Add api target to phing build script. 2014-07-19 01:10:30 +02:00
Andreas Fischer
d86a17271f Add sami configuration file. 2014-07-19 01:04:18 +02:00
Andreas Fischer
3c9614991a Add sami/sami 1.* as a development dependency. 2014-07-19 00:57:13 +02:00
Andreas Fischer
7dd01c6103 Put some assertions into testStatcacheFix(). 2014-07-19 00:28:39 +02:00
terrafrost
41ae2fb130 SFTP: return $sftp object in new unit test method 2014-07-17 11:35:58 -05:00
terrafrost
6202d2c3ed SFTP: add unit test for stat cache fix 2014-07-17 11:22:59 -05:00
Andreas Fischer
237e238268 Merge branch 'master' into php5
* master:
  Add Support section to README.

Conflicts:
	README.md
2014-07-17 02:47:04 +02:00
Andreas Fischer
13317c1004 Merge pull request #407 from bantu/readme-support-section
Add Support section to README.

* bantu/readme-support-section:
  Add Support section to README.
2014-07-17 02:46:18 +02:00
Andreas Fischer
48b9d3ccfb Add Support section to README. 2014-07-14 20:21:37 +02:00
Andreas Fischer
8e0b9b2d64 Merge branch 'master' into php5
* master:
  SFTP: fix an issue with the stat cache
  README: update download link to latest version
2014-07-12 12:08:36 +02:00
Andreas Fischer
5a5d0fcf56 Merge pull request #403 from terrafrost/stat-cache-fix
SFTP: fix an issue with the stat cache

* terrafrost/stat-cache-fix:
  SFTP: fix an issue with the stat cache
2014-07-12 12:08:34 +02:00
terrafrost
fe7fd97b59 SFTP: fix an issue with the stat cache 2014-07-11 12:14:26 -05:00
terrafrost
8b8c62f278 README: update download link to latest version 2014-07-05 11:36:21 -05:00
Andreas Fischer
d198756a76 Merge branch 'master' into php5
* master:
  SCP: always encapsulate filenames within double quotes
  SCP: add support for file names with spaces
2014-07-05 17:40:07 +02:00
Andreas Fischer
ba24e04729 Merge pull request #394 from terrafrost/scp-spaces
SCP: add support for file names with spaces

* terrafrost/scp-spaces:
  SCP: always encapsulate filenames within double quotes
  SCP: add support for file names with spaces
2014-07-05 17:40:01 +02:00
terrafrost
aec33901fc SCP: always encapsulate filenames within double quotes 2014-07-03 13:36:24 -05:00
Andreas Fischer
2ea46f8091 Merge pull request #395 from bantu/stream-registration-php5
Remove side-effect from Net/SFTP/Stream.php.

* bantu/stream-registration-php5:
  Remove side-effect from Net/SFTP/Stream.php.
2014-06-30 01:45:38 +02:00
Andreas Fischer
970c55d6cc Remove side-effect from Net/SFTP/Stream.php. 2014-06-27 14:22:47 +02:00
Andreas Fischer
d25d115747 Merge branch 'master' into php5
* master:
  Use get_called_class() if available.
  Add Net_SFTP_Stream::register() for easier autoloading.
  Add unit test for (to be added) Net_SFTP_Stream::register().
2014-06-27 14:14:18 +02:00
Andreas Fischer
af8f350050 Merge pull request #393 from bantu/stream-registration
Add Net_SFTP_Stream::register()

* bantu/stream-registration:
  Use get_called_class() if available.
  Add Net_SFTP_Stream::register() for easier autoloading.
  Add unit test for (to be added) Net_SFTP_Stream::register().
2014-06-27 14:14:15 +02:00
terrafrost
9edf905939 SCP: add support for file names with spaces 2014-06-26 20:41:43 -05:00
Andreas Fischer
0f672dde52 Use get_called_class() if available. 2014-06-27 00:35:19 +02:00
Andreas Fischer
73f961cb7d Add Net_SFTP_Stream::register() for easier autoloading. 2014-06-27 00:22:41 +02:00
Andreas Fischer
f360932343 Add unit test for (to be added) Net_SFTP_Stream::register(). 2014-06-27 00:21:55 +02:00
Andreas Fischer
510d5e1778 Merge branch 'master' into php5
* master:
  SFTP: return $sftp object in unit tests
  SFTP: fix unit test
  SFTP: syntax error in unit test
  SFTP: add unit tests for symlinks
  SFTP: add readlink and symlink functions
2014-06-23 16:37:56 +02:00
Andreas Fischer
949cfcc867 Merge pull request #386 from terrafrost/symlink
SFTP: add readlink and symlink functions

* terrafrost/symlink:
  SFTP: return $sftp object in unit tests
  SFTP: fix unit test
  SFTP: syntax error in unit test
  SFTP: add unit tests for symlinks
  SFTP: add readlink and symlink functions
2014-06-23 16:37:55 +02:00
Andreas Fischer
ca4f6a21eb Merge branch 'master' into php5
* master:
  Removed white-spaces from line ends
  Allow setting the terminal window size
2014-06-23 16:36:23 +02:00
Andreas Fischer
a40e6a0838 Merge pull request #389 from liutec/patch-1
Allow setting the terminal window size other than 80x24

* liutec/patch-1:
  Removed white-spaces from line ends
  Allow setting the terminal window size
2014-06-23 16:36:16 +02:00
liutec
10597aed64 Removed white-spaces from line ends 2014-06-22 22:30:52 +03:00
liutec
8e1df6e3c3 Allow setting the terminal window size 2014-06-20 13:04:17 +03:00
terrafrost
03c315d546 SFTP: return $sftp object in unit tests 2014-06-19 23:57:32 -05:00
terrafrost
05baf7b73b SFTP: fix unit test 2014-06-19 13:57:42 -05:00
terrafrost
366410e2e1 SFTP: syntax error in unit test 2014-06-19 10:42:20 -05:00
Andreas Fischer
67802608b6 Merge pull request #388 from bantu/php5-drop-phpseclib_resolve_include_path
[php5] Drop phpseclib_resolve_include_path

* bantu/php5-drop-phpseclib_resolve_include_path:
  Depend on PHP 5.3.2 accordingly.
  Replace phpseclib_resolve_include_path with stream_resolve_include_path.
2014-06-19 16:58:55 +02:00
Andreas Fischer
42faf9e767 Depend on PHP 5.3.2 accordingly. 2014-06-19 16:16:20 +02:00
Andreas Fischer
b50ef2dc64 Replace phpseclib_resolve_include_path with stream_resolve_include_path. 2014-06-19 16:14:15 +02:00
Andreas Fischer
f85d333912 Merge branch 'master' into php5
* master:
  phpseclib_is_includable() -> phpseclib_resolve_include_path()
  Drop Net_SSH2::_is_includable() method.
  Random: a few changes to the stream_resolve_include_path_function
  Replace stream_resolve_include_path with phpseclib_is_includable.
  Random: add explanatory comment
  SSH2: replace _is_includable() with stream_resolve_include_path
  Random: include the Crypt_* classes if they're available

Conflicts:
	tests/bootstrap.php
2014-06-19 16:09:23 +02:00
Andreas Fischer
709c7c4d48 Merge pull request #385 from bantu/a-random-change
Random: include the Crypt_* classes if they're available

* bantu/a-random-change:
  phpseclib_is_includable() -> phpseclib_resolve_include_path()
  Drop Net_SSH2::_is_includable() method.
  Random: a few changes to the stream_resolve_include_path_function
  Replace stream_resolve_include_path with phpseclib_is_includable.
  Random: add explanatory comment
  SSH2: replace _is_includable() with stream_resolve_include_path
  Random: include the Crypt_* classes if they're available
2014-06-19 16:08:59 +02:00
terrafrost
f95bf8b10b SFTP: add unit tests for symlinks 2014-06-19 09:00:23 -05:00
Andreas Fischer
d314065329 Merge branch 'master' into php5
* master:
  runkit is currently not compatible with PHP 5.6.0 Beta 4
2014-06-19 15:49:59 +02:00
Andreas Fischer
66b17f4790 Merge pull request #387 from bantu/runkit-broken-php5.6beta4
runkit is currently not compatible with PHP 5.6.0 Beta 4

* bantu/runkit-broken-php5.6beta4:
  runkit is currently not compatible with PHP 5.6.0 Beta 4
2014-06-19 15:49:58 +02:00
Andreas Fischer
db228c9224 runkit is currently not compatible with PHP 5.6.0 Beta 4 2014-06-19 15:36:55 +02:00