1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-13 01:27:40 +01:00
phpseclib/phpseclib
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
..
Crypt add error suppression to phpinfo() 2014-03-30 10:15:08 -05:00
File X509: Array -> array (CS consistency) 2014-03-29 15:26:50 -05:00
Math add error suppression to phpinfo() 2014-03-30 10:15:08 -05:00
Net Merge branch 'master' into php5 2014-04-10 18:00:38 +02:00
System/SSH Remove the phpseclib/System/SSH_Agent.php BC file. 2014-04-01 23:15:16 +02:00
openssl.cnf Cleaned up whitespace 2014-01-18 17:29:25 +00:00