[Pkg-nagios-changes] [pkg-icingaweb2] 01/03: Imported Upstream version 2.3.4

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-icingaweb2.

commit e111f8c07f47fb1eae8591d170149489d5c4cae8
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jun 20 19:57:04 2016 +0200

    Imported Upstream version 2.3.4
---
 application/VERSION                                |  2 +-
 .../Command/Transport/RemoteCommandFile.php        | 24 ++--------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/application/VERSION b/application/VERSION
index ba9e5c0..f8e9d27 100644
--- a/application/VERSION
+++ b/application/VERSION
@@ -1 +1 @@
-d4b9b6d303a15f72e6f75b87a558df9519ccec60 2016-06-07 15:15:01 +0200
+1bbe1b36205bff70718abe78b7c5e400e862f37f 2016-06-09 16:43:06 +0200
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index ab0e78c..5426bb9 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -341,24 +341,6 @@ class RemoteCommandFile implements CommandTransportInterface
                     'Failed to write the whole command to the remote command pipe'
                 );
             }
-            fclose($this->sshPipes[0]);
-            $readBuffer = $read = array($this->sshPipes[2]);
-            $write = null;
-            $except = null;
-            $stderr = '';
-            while (
-                false !== (stream_select($readBuffer, $write, $exceptBuffer, 0, 20000))
-                && $this->getSshProcessStatus('running')
-            ) {
-                if (! empty($readBuffer)) {
-                    $stderr .= stream_get_contents($readBuffer[0]);
-                }
-                // Reset buffer
-                $readBuffer = $read;
-            }
-            if (! empty($stderr)) {
-                throw new CommandTransportException('Can\'t send external Icinga command: %s', trim($stderr));
-            }
         } else {
             $this->throwSshFailure();
         }
@@ -436,7 +418,7 @@ class RemoteCommandFile implements CommandTransportInterface
 
         if (! is_resource($this->sshProcess)) {
             throw new CommandTransportException(
-                'Can\'t send external Icinga command, failed to fork SSH'
+                'Can\'t send external Icinga command: Failed to fork SSH'
             );
         }
     }
@@ -473,9 +455,7 @@ class RemoteCommandFile implements CommandTransportInterface
     public function __destruct()
     {
         if (is_resource($this->sshProcess)) {
-            if (is_resource($this->sshPipes[0])) {
-                fclose($this->sshPipes[0]);
-            }
+            fclose($this->sshPipes[0]);
             fclose($this->sshPipes[1]);
             fclose($this->sshPipes[2]);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git