Merge branch 'master' into php5

* master:
  Make Net_SSH2::isConnected() return a boolean instead of int.
This commit is contained in:
Andreas Fischer 2014-07-20 23:31:30 +02:00
commit 025a637053

View File

@ -2651,11 +2651,12 @@ class Net_SSH2
/** /**
* Is the connection still active? * Is the connection still active?
* *
* @return boolean
* @access public * @access public
*/ */
function isConnected() function isConnected()
{ {
return $this->bitmap & NET_SSH2_MASK_CONNECTED; return (bool) ($this->bitmap & NET_SSH2_MASK_CONNECTED);
} }
/** /**