1
0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-11 08:39:43 +01:00
tgseclib/phpseclib/Net
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
..
SFTP Drop meaningless, outdated, inconsistent version tags in doc blocks. 2014-03-11 15:58:33 +01:00
SCP.php Drop meaningless, outdated, inconsistent version tags in doc blocks. 2014-03-11 15:58:33 +01:00
SFTP.php Drop meaningless, outdated, inconsistent version tags in doc blocks. 2014-03-11 15:58:33 +01:00
SSH1.php SSH: clarify role of constructor / connection timeout 2014-04-07 10:26:46 -05:00
SSH2.php Merge branch 'master' into php5 2014-04-10 18:00:38 +02:00