浏览代码

Fix IMAP parsing to properly match Non-FETCH reponses.

indiri69 23 年之前
父节点
当前提交
da886250a9
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      functions/mime.php

+ 2 - 2
functions/mime.php

@@ -382,8 +382,8 @@ function mime_fetch_body($imap_stream, $id, $ent_id ) {
     $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message);
     $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message);
 
 
     do {
     do {
-        $topline = array_shift( $data );
-    } while( $topline && $topline == '*' && !preg_match( '/\\* [0-9] FETCH.*/i', $topline )) ;
+        $topline = trim(array_shift( $data ));
+    } while( $topline && $topline[0] == '*' && !preg_match( '/\* [0-9]+ FETCH.*/i', $topline )) ;
     $wholemessage = implode('', $data);
     $wholemessage = implode('', $data);
     if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) {
     if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) {