fix: backport community fixes from bytestream fork

Original-Author: Anna Larch <anna@nextcloud.com> (Ids int cast, ceafee1)
Original-Author: Richard Steinmetz <richard@steinmetz.cloud> (Tokenize resource leak, e72ae63)
Original-Author: Daniel Kesselberg <mail@danielkesselberg.de> (Socket read timeout exception, 33dc825)
Original-Author: Daniel Kesselberg <mail@danielkesselberg.de> (Socket vanished chunking, 69a022d)
Original-Author: Kieran Brahney <kieran.brahney@gmail.com> (Pop3 null date cast, fed98c8)
Original-Author: Kieran Brahney <kieran.brahney@gmail.com> (Exception constructor defaults, bdb0e46)
Original-Author: Daniel Kesselberg <mail@danielkesselberg.de> (Connection debug message, f66eeb6)

Author: ralflang

lib/Horde/Imap/Client/Exception.php

@@ -261,7 +261,7 @@ class Horde_Imap_Client_Exception extends Horde_Exception_Wrapped
      * @param string $message  Error message (non-translated).
      * @param int $code        Error code.
      */
-    public function __construct($message = null, $code = null)
+    public function __construct($message = '', $code = 0)
     {
         parent::__construct($message, $code);
 

lib/Horde/Imap/Client/Ids.php

@@ -169,7 +169,7 @@ public function add($ids)
             } elseif ($add = $this->_resolveIds($ids)) {
                 if (is_array($this->_ids) && !empty($this->_ids)) {
                     foreach ($add as $val) {
-                        $this->_ids[] = $val;
+                        $this->_ids[] = (int) $val;
                     }
                 } else {
                     $this->_ids = $add;
@@ -364,10 +364,10 @@ protected function _fromSequenceString($str)
             $range = explode(':', $val);
             if (isset($range[1])) {
                 for ($i = min($range), $j = max($range); $i <= $j; ++$i) {
-                    $ids[] = $i;
+                    $ids[] = (int) $i;
                 }
             } else {
-                $ids[] = $val;
+                $ids[] = (int) $val;
             }
         }
 

lib/Horde/Imap/Client/Socket.php

@@ -3568,21 +3568,29 @@ protected function _parseEnvelope(Horde_Imap_Client_Tokenize $data)
         return $ret;
     }
 
-    /**
-     */
     protected function _vanished($modseq, Horde_Imap_Client_Ids $ids)
     {
-        $pipeline = $this->_pipeline(
-            $this->_command('UID FETCH')->add([
-                strval($ids),
+        // Unlike _fetchCmd(), sequence IDs are rejected before reaching
+        // here, so we always issue UID FETCH. Chunk UIDs to avoid
+        // exceeding the server's command length limit.
+
+        $modifiers = new Horde_Imap_Client_Data_Format_List([
+            'VANISHED',
+            'CHANGEDSINCE',
+            new Horde_Imap_Client_Data_Format_Number($modseq),
+        ]);
+
+        $pipeline = $this->_pipeline();
+
+        foreach ($ids->split($this->_capability()->cmdlength) as $val) {
+            $cmd = $this->_command('UID FETCH')->add([
+                $val,
                 'UID',
-                new Horde_Imap_Client_Data_Format_List([
-                    'VANISHED',
-                    'CHANGEDSINCE',
-                    new Horde_Imap_Client_Data_Format_Number($modseq),
-                ]),
-            ])
-        );
+                $modifiers,
+            ]);
+            $pipeline->add($cmd);
+        }
+
         $pipeline->data['vanished'] = $this->getIdsOb();
 
         return $this->_sendCmd($pipeline)->data['vanished'];
@@ -4339,13 +4347,15 @@ protected function _sendCmdChunk($pipeline, $chunk)
                         $this->_temp['logout'] = true;
                         $this->logout();
                         throw $e;
-                }
 
-                /* For all other issues, catch and store exception; don't
-                 * throw until all input is read since we need to clear
-                 * incoming queue. (For now, only store first exception.) */
-                if (is_null($exception)) {
-                    $exception = $e;
+                    default:
+                        /* For all other issues, catch and store exception;
+                         * don't throw until all input is read since we need
+                         * to clear incoming queue. (For now, only store first
+                         * exception.) */
+                        if (is_null($exception)) {
+                            $exception = $e;
+                        }
                 }
 
                 if (($e instanceof Horde_Imap_Client_Exception_ServerResponse)

lib/Horde/Imap/Client/Socket/Connection/Socket.php

@@ -197,7 +197,7 @@ public function read($size = null)
                         $read_now = microtime(true);
                         $t_read = $read_now - $read_start;
                         if ($t_read > $this->_params['timeout']) {
-                            $this->_params['debug']->info(sprintf('ERROR: read timeout. No data received for %d seconds.', $this->_params['read_timeout']));
+                            $this->_params['debug']->info(sprintf('ERROR: read timeout. No data received for %d seconds.', $this->_params['timeout']));
 
                             throw new Horde_Imap_Client_Exception(
                                 Horde_Imap_Client_Translation::r("Read timeout."),

lib/Horde/Imap/Client/Socket/Pop3.php

@@ -1029,7 +1029,7 @@ protected function _fetchCmd(
                 case Horde_Imap_Client::FETCH_IMAPDATE:
                     foreach ($seq_ids as $id) {
                         $tmp = $this->_pop3Cache('hdrob', $id);
-                        $results->get($lookup[$id])->setImapDate($tmp['Date']);
+                        $results->get($lookup[$id])->setImapDate((string) $tmp['Date']);
                     }
                     break;
 

lib/Horde/Imap/Client/Tokenize.php

@@ -94,6 +94,11 @@ public function __construct($data = null)
         }
     }
 
+    public function __destruct()
+    {
+        $this->_stream->close();
+    }
+
     /**
      */
     public function __clone()