Revert "Fixes"

This reverts commit be01c7d.
horde · Oct 1, 2013 · 4bf89cf · 4bf89cf
1 parent 70f3ad7
commit 4bf89cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -1728,20 +1728,13 @@ protected function _append(Horde_Imap_Client_Mailbox $mailbox, $data,
      * Prepares append message data for insertion into the IMAP command
      * string.
      *
-     * @param mixed $data      Either a Horde_Stream object, a resource,
-     *                         or a string.
+     * @param mixed $data      Either a Horde_Stream object or a string.
      * @param integer &$asize  Total append size.
      *
      * @return Horde_Imap_Client_Data_Format_String  The data object.
      */
     protected function _appendData($data, &$asize)
     {
-        if (is_resource($data)) {
-            $data = new Horde_Stream_Existing(array(
-                'stream' => $data
-            ));
-        }
-
         if ($data instanceof Horde_Stream) {
             $data->rewind();
         }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection/Socket.php
@@ -105,7 +105,7 @@ public function writeLiteral($data, $length, $binary = false)
         }
 
         $data->rewind();
-        while (!$data->eof()) {
+        while ($data->eof()) {
             if (fwrite($this->_stream, $data->getString(null, 8192)) === false) {
                 throw new Horde_Imap_Client_Exception(
                     Horde_Imap_Client_Translation::t("Server write error."),