Changeset 03a63a4 in github

Timestamp:

Jul 30, 2009 7:56:10 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

a80b7d4

Parents:

4bd9c01

Message:

• Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (8 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)
 - Fix #messagemenu display on IE (#1486006)
 - Speedup UI by using sprites for (toolbar) buttons

program/lib/imap.inc

@@ -244 +244 @@
         do {
                 $buffer = fgets($fp, $size);
+
                 if ($buffer === false) {
                         break;
@@ -251 +252 @@
                 $line .= $buffer;
         } while ($buffer[strlen($buffer)-1] != "\n");
-        
+
         return $line;
 }
@@ -291 +292 @@
 }
 
+// don't use it in loops, until you exactly know what you're doing
 function iil_ReadReply($fp) {
         do {
                 $line = trim(iil_ReadLine($fp, 1024));
         } while ($line[0] == '*');
-        
+
         return $line;
 }
@@ -443 +445 @@
     iil_PutLine($conn->fp, 'a001 LOGIN "'.iil_Escape($user).'" "'.iil_Escape($password).'"');
 
-    do {
-        $line = iil_ReadReply($conn->fp);
-        if ($line === false) {
-            break;
-        }
-    } while (!iil_StartsWith($line, 'a001 ', true));
-    
+    $line = iil_ReadReply($conn->fp);
+
     // process result
     $result = iil_ParseResult($line);
@@ -590 +587 @@
                 $IMAP_USE_INTERNAL_DATE = false;
         }
-        //echo '<!-- conn sort_field: '.$my_prefs['sort_field'].' //-->';
         
         //check input
@@ -626 +622 @@
         stream_set_timeout($conn->fp, 10);
         $line = stream_get_line($conn->fp, 8192, "\r\n");
+
+        if ($my_prefs['debug_mode'] && $line)
+                write_log('imap', 'S: '. $line);
 
         // Connected to wrong port or connection error?
@@ -636 +635 @@
                 return false;
         }
-        
+
         // RFC3501 [7.1] optional CAPABILITY response
         if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
@@ -1834 +1833 @@
                 
                 iil_PutLine($fp, "cpy1 UID COPY $messages \"".iil_Escape($to)."\"");
-                $line=iil_ReadReply($fp);
+                $line = iil_ReadReply($fp);
                 return iil_ParseResult($line);
         } else {