Don't strip trailing ws for literal data; fix error detection

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index d1155ca..8f9b8ae 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -3233,7 +3233,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
             }
         }
 
-        if ($data === false) {
+        if (!strlen($data)) {
             if ($this->_debug) {
                 fwrite($this->_debug, '[ERROR: IMAP read error.]' . "\n");
             }
@@ -3244,7 +3244,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
             fwrite($this->_debug, 'S (' . microtime(true) . '): ' . ($binary ? '[BINARY DATA - ' . $len . ' bytes]' : $data));
         }
 
-        return rtrim($data);
+        return is_null($len) ? rtrim($data) : $data;
     }
 
     /**