Changeset 0bc59eeb in github

Timestamp:

Jun 4, 2010 7:05:59 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

dbe49889

Parents:

ccf250e

Message:

• Fix handling very long THREAD responses

File:

• program/include/rcube_imap_generic.php (modified) (4 diffs)

program/include/rcube_imap_generic.php

@@ -1507 +1507 @@
             $node = array();
             if ($str[$begin] != '(') {
-                    $stop = $begin + strspn($str, "1234567890", $begin, $end - $begin);
+                    $stop = $begin + strspn($str, '1234567890', $begin, $end - $begin);
                     $msg = substr($str, $begin, $stop - $begin);
                     if ($msg == 0)
@@ -1567 +1567 @@
             $algorithm = $algorithm ? trim($algorithm) : 'REFERENCES';
             $criteria  = $criteria ? 'ALL '.trim($criteria) : 'ALL';
+        $data      = '';
 
             if (!$this->putLineC("thrd1 THREAD $algorithm $encoding $criteria")) {
@@ -1572 +1573 @@
             }
             do {
-                    $line = trim($this->readLine(10000));
-                    if (preg_match('/^\* THREAD/', $line)) {
-                            $str         = trim(substr($line, 8));
-                        $depthmap    = array();
-                        $haschildren = array();
-                            $tree = $this->parseThread($str, 0, strlen($str), null, null, 0, $depthmap, $haschildren);
+                    $line = trim($this->readLine());
+                    if ($this->startsWith($line, '* THREAD')) {
+                        $data .= substr($line, 9);
+                } else if (preg_match('/^[0-9() ]+$/', $line)) {
+                        $data .= $line;
                     }
             } while (!$this->startsWith($line, 'thrd1', true, true));
@@ -1583 +1583 @@
         $result_code = $this->parseResult($line);
             if ($result_code == 0) {
-            return array($tree, $depthmap, $haschildren);
+            $depthmap    = array();
+            $haschildren = array();
+            $tree = $this->parseThread($data, 0, strlen($data), null, null, 0, $depthmap, $haschildren);
+            return array($tree, $depthmap, $haschildren);
             }