mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-16 02:07:09 +00:00
Merge branch 'master' into php5
* master: Make Net_SSH2::isConnected() return a boolean instead of int.
This commit is contained in:
commit
025a637053
@ -823,7 +823,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Number of columns for terminal window size
|
||||
*
|
||||
*
|
||||
* @see Net_SSH2::getWindowColumns()
|
||||
* @see Net_SSH2::setWindowColumns()
|
||||
* @see Net_SSH2::setWindowSize()
|
||||
@ -834,7 +834,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Number of columns for terminal window size
|
||||
*
|
||||
*
|
||||
* @see Net_SSH2::getWindowRows()
|
||||
* @see Net_SSH2::setWindowRows()
|
||||
* @see Net_SSH2::setWindowSize()
|
||||
@ -2651,11 +2651,12 @@ class Net_SSH2
|
||||
/**
|
||||
* Is the connection still active?
|
||||
*
|
||||
* @return boolean
|
||||
* @access public
|
||||
*/
|
||||
function isConnected()
|
||||
{
|
||||
return $this->bitmap & NET_SSH2_MASK_CONNECTED;
|
||||
return (bool) ($this->bitmap & NET_SSH2_MASK_CONNECTED);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -3797,7 +3798,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Returns the number of columns for the terminal window size.
|
||||
*
|
||||
*
|
||||
* @return Integer
|
||||
* @access public
|
||||
*/
|
||||
@ -3808,7 +3809,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Returns the number of rows for the terminal window size.
|
||||
*
|
||||
*
|
||||
* @return Integer
|
||||
* @access public
|
||||
*/
|
||||
@ -3819,7 +3820,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Sets the number of columns for the terminal window size.
|
||||
*
|
||||
*
|
||||
* @param Integer $value
|
||||
* @access public
|
||||
*/
|
||||
@ -3830,7 +3831,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Sets the number of rows for the terminal window size.
|
||||
*
|
||||
*
|
||||
* @param Integer $value
|
||||
* @access public
|
||||
*/
|
||||
@ -3841,7 +3842,7 @@ class Net_SSH2
|
||||
|
||||
/**
|
||||
* Sets the number of columns and rows for the terminal window size.
|
||||
*
|
||||
*
|
||||
* @param Integer $columns
|
||||
* @param Integer $rows
|
||||
* @access public
|
||||
|
Loading…
Reference in New Issue
Block a user