Andreas Fischer
4290a5c216
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 00:26:36 +01:00
terrafrost
172f15f5df
SFTP: add explanation for use of 4294967296
2013-12-24 23:44:21 -06:00
terrafrost
3a0193875a
RSA: more verbose RSA key handling
2013-12-24 18:37:43 -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
Marc Philip Scholten
ea8cadddad
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
2013-12-18 16:39:36 +01:00
Marc Philip Scholten
c5f8bab065
Added Net_SSH1::_format_log test
...
Conflicts:
tests/Net/SSH1Test.php
2013-12-18 16:39:20 +01: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
Andreas Fischer
0dc8b27a6a
Merge pull request #215 from terrafrost/preg-replace-callback
...
SSH2: fix E_DEPRECATED on PHP5.5
* terrafrost/preg-replace-callback:
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-17 20:55:56 +01:00
Andreas Fischer
0f94f08348
Merge branch 'master' into php5
...
* master:
Fixed typo and fixed bug with destructor being called in test on ssh object
Added test for Net_SSH2::_format_log()
2013-12-17 20:55:27 +01:00
Andreas Fischer
a35557f12a
Merge pull request #213 from mpscholten/test-for-ssh2-format-log
...
Added test for Net_SSH2::_format_log()
* mpscholten/test-for-ssh2-format-log:
Fixed typo and fixed bug with destructor being called in test on ssh object
Added test for Net_SSH2::_format_log()
2013-12-17 20:55:12 +01:00
Marc Philip Scholten
46a1a0c1c2
Fixed typo and fixed bug with destructor being called in test on ssh object
2013-12-17 20:09:26 +01:00
Marc Philip Scholten
f0b9f59bcc
Added test for Net_SSH2::_format_log()
2013-12-16 19:49:15 +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
df8c3723aa
Merge pull request #208 from bantu/cs-classcomment-wrongtagorder
...
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
* bantu/cs-classcomment-wrongtagorder:
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 23:30:13 +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
b1cf3aeb0a
Merge pull request #207 from bantu/cs-file-comment-tag-indent
...
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
* bantu/cs-file-comment-tag-indent:
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 22:29:05 +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
ffa1393a4c
Merge pull request #204 from bantu/cs-multiline-assign-equal
...
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
* bantu/cs-multiline-assign-equal:
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-10 12:42:19 +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
10b47a1e5a
Merge pull request #203 from bantu/cs-include-once
...
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
* bantu/cs-include-once:
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 12:20:36 +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
52e85604e5
Merge pull request #202 from bantu/cs-include-para
...
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
* bantu/cs-include-para:
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-06 00:57:54 +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
9dd34025e1
Merge branch 'master' into php5
...
* master:
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:39:23 +01:00
Andreas Fischer
8271f0fd29
Merge pull request #200 from bantu/cs-else-no-newline
...
CodeSniffer: Fix PEAR.ControlStructures.ControlSignature sniff.
* bantu/cs-else-no-newline:
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:39:17 +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
23cce39d56
Merge branch 'master' into php5
...
* master:
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 21:03:56 +01:00
Andreas Fischer
bdaf590d27
Merge pull request #199 from bantu/cs-space-after-comma
...
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff
* bantu/cs-space-after-comma:
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 21:03:49 +01:00
Andreas Fischer
9ca5f83dec
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 20:52:08 +01:00
Andreas Fischer
803042e11e
Merge branch 'master' into php5
...
* master:
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 20:46:44 +01:00
Andreas Fischer
b6dd1f92bf
Merge pull request #198 from bantu/cs-openbrace-class
...
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
* bantu/cs-openbrace-class:
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 20:46:31 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Andreas Fischer
7ee0745f5e
Merge branch 'master' into php5
...
* master:
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 19:25:38 +01:00
Andreas Fischer
78b5084bf5
Merge pull request #197 from bantu/cs-lowercase-constant
...
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
* bantu/cs-lowercase-constant:
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 19:25:30 +01:00
Andreas Fischer
ca9c8b107b
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 18:54:43 +01:00
Andreas Fischer
70717bf1a1
Merge branch 'master' into php5
...
* master:
Base CodeSniffer ruleset on PEAR ruleset.
2013-12-01 12:49:23 +01:00
Andreas Fischer
ecd58b6a03
Merge pull request #195 from bantu/code-sniffer-pear
...
Base CodeSniffer ruleset on PEAR ruleset.
* bantu/code-sniffer-pear:
Base CodeSniffer ruleset on PEAR ruleset.
2013-12-01 12:49:17 +01:00