Andreas Fischer
c033e4ea57
Merge branch 'master' into php5
...
* master:
SFTP: add explanation for use of 4294967296
SSH2: typos in last commit
Compatibility fixes
2013-12-26 00:37:08 +01:00
terrafrost
172f15f5df
SFTP: add explanation for use of 4294967296
2013-12-24 23:44:21 -06:00
terrafrost
8424a464a6
SSH2: typos in last commit
2013-12-22 18:25:00 -06:00
terrafrost
0f5b3ea416
Compatibility fixes
...
- PHP4 doesn't allow method chaining
- $_SESSION isn't always defined
- on PHP5.1 and earlier using 0x100000000 instead of 4294967296 gives E_NOTICE
- array('Net_SSH2', 'func_name') doesn't work so we fix this by passing $this to it.
to make that work on PHP4 pass by call-time reference. normally this would result
in a fatal error on PHP5.4+ but doesn't seem to in this case. the following URL
elaborates:
http://stackoverflow.com/q/20732563/569976
2013-12-22 18:14:49 -06:00
terrafrost
4bd9a546ab
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-22 11:53:35 -06:00
terrafrost
c26594ba08
Merge remote-tracking branch 'upstream/php5' into php5
2013-12-22 11:50:11 -06:00
Andreas Fischer
d311698340
Merge branch 'master' into php5
...
* master:
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-17 20:56:06 +01:00
terrafrost
6ac922726d
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-16 11:27:12 -06:00
terrafrost
1599d2e8d1
SCP: use the new "mode" for _close_channel
2013-12-15 12:07:17 -06:00
terrafrost
c01b8fc4ed
SCP: Tweaks
...
sending the close channel packet right after the eof seems to make some scp transfers terminate prematurely.
unfortunately, sometimes this behavior is undesirable as it is in this case:
http://www.frostjedi.com/phpbb3/viewtopic.php?f=46&t=29457
hence the $want_reply parameter
also, this commit makes the scp packet length account for the length portion
2013-12-15 00:43:20 -06:00
Andreas Fischer
03b08ceaa0
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 23:30:19 +01:00
Andreas Fischer
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
3729ba3e44
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 22:29:11 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
9c0b5e1453
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-10 12:42:25 +01:00
Andreas Fischer
cee0f3343b
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-07 20:47:30 +01:00
Andreas Fischer
452d3dc359
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 12:20:42 +01:00
Andreas Fischer
6d1fb9f7db
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 01:03:34 +01:00
Andreas Fischer
64691f2aec
Merge branch 'master' into php5
...
* master:
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-06 00:58:00 +01:00
Andreas Fischer
bc6ff96292
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-05 23:17:40 +01:00
Andreas Fischer
d696f22b89
Merge pull request #201 from mpscholten/php5-ssh2-microtime
...
Replaced php4 hack for microtime(true) with real microtime(true)
* mpscholten/php5-ssh2-microtime:
Replaced php4 hack for microtime(true) with real microtime(true)
2013-12-05 20:54:11 +01:00
Marc Philip Scholten
d6c70a76d9
Replaced php4 hack for microtime(true) with real microtime(true)
2013-12-05 18:46:46 +01:00
Andreas Fischer
ef2c50f9e0
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
2013-12-03 21:04:13 +01:00
Andreas Fischer
161bb7d362
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:04:13 +01:00
Andreas Fischer
9ca5f83dec
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 20:52:08 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Andreas Fischer
ca9c8b107b
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 18:54:43 +01:00
Andreas Fischer
399308f98a
Merge pull request #180 from mpscholten/removed-vim-comments
...
Removed vim comments
* mpscholten/removed-vim-comments:
Removed vim comments
2013-11-23 21:16:25 +01:00
Marc Philip Scholten
3bfd884813
Removed vim comments
...
Reformated files
2013-11-23 19:42:26 +01:00
phonzie
3afa655f57
SSH2: Continue Subsystem Implementation.
...
Removed unused piece of code @2352.
Added $this->_get_interactive_channel() to reset(). Unless we don't want to close the subsystem channel?? Leaving that decision up to you.
2013-11-20 16:17:23 -05:00
phonzie
702ade7d12
SFTP: Removed dead code
...
variable: $initialize = true, ironically - is initialized but never used.
Feel free to deny if this is reserved for future implementation(s).
2013-11-20 15:02:04 -05:00
terrafrost
fcfc0e2c00
SFTP: don't do $dir[-1] check if $dir === ''
2013-11-20 09:33:47 -06:00
terrafrost
187f40a247
Merge pull request #173 from h4cc/patch-1
...
Making Net_SFTP::chdir capable of handling the empty string.
2013-11-20 07:29:16 -08:00
terrafrost
478dd38e8f
SFTP/Stream: log when constructor is called
2013-11-20 09:11:14 -06:00
Julius Beckmann
44078e5f40
Making Net_SFTP::chdir capable of handling the empty string.
...
Updated patch after hint from bantu.
2013-11-20 15:08:50 +01:00
Julius Beckmann
9ea67f9edb
Making Net_SFTP::chdir capable of handling the empty string.
...
Fixing a ugly notice when using the empty string as parameter for chdir:
Notice: Uninitialized string offset: -1 in Net/SFTP.php line 617
2013-11-20 14:49:16 +01:00
Vincent Petry
2517dd4a61
Initing eof to false
...
The call _stream_eof() must return a boolean, not null.
Returning null makes PHP believe that the method wasn't implemented.
Fixes #170
2013-11-19 23:13:10 +01:00
phonzie
8dd12ed467
SFTP_Stream: Fixed typo in _parse_path
...
typo: isset($this->contenxt)
should be $this->context
2013-11-19 14:23:54 -05:00
phonzie
eb3bffaa00
Update SSH2.php
...
Use of undefined property: "$this->bitmask".
In context, it seems that it should reference the "bitmap" property.
2013-11-15 13:34:31 -05:00
terrafrost
300a3afe8d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-11-10 22:38:36 -06:00
terrafrost
755f0f17a5
RSA: putty keys weren't being formatted correctly
2013-11-10 22:27:48 -06:00
Andreas Fischer
2241d0e6f4
Partial revert of 9f1108e52e
.
...
This change should not be necessary.
2013-11-06 23:12:00 +01:00
Frank de Jonge
4976cd1622
Fixed coding style to comply with other not defined statements
2013-11-05 13:01:03 +01:00
Frank de Jonge
9f1108e52e
Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it.
2013-11-05 11:27:16 +01:00
Jesse Schalken
71ae795460
Fixed typo in object class name comparison
2013-11-04 17:48:01 +11:00
Brian Nesbitt
ccad4b7d08
Added a callable to put for progress updates
...
This in combination with https://github.com/maximebf/ConsoleKit ProgressBar makes me feel good.
2013-11-01 12:15:28 -04:00
terrafrost
c6a52cb1b1
SSH2: add preliminary support for custom SSH subsystems
2013-10-25 12:35:30 -05:00
terrafrost
15677715e3
RSA: only set $this->current when it's already set
2013-10-24 15:48:15 -05:00
terrafrost
5888c6cef6
SCP: if exec() failed return false immediately
2013-10-21 15:15:31 -05:00
terrafrost
1e3ff81e7d
RSA: make RSA objects clonable
2013-10-18 13:24:06 -05:00