Merge branch 'master' into php5

* master:
  SSH2: clarify exec() docblock comment
This commit is contained in:
Andreas Fischer 2014-11-20 10:58:33 +01:00
commit 43d2e9ef68

View File

@ -2258,7 +2258,7 @@ class Net_SSH2
/**
* Execute Command
*
* If $block is set to false then Net_SSH2::_get_channel_packet(NET_SSH2_CHANNEL_EXEC) will need to be called manually.
* If $callback is set to false then Net_SSH2::_get_channel_packet(NET_SSH2_CHANNEL_EXEC) will need to be called manually.
* In all likelihood, this is not a feature you want to be taking advantage of.
*
* @param String $command