Changeset b8ae99a6 in github

Timestamp:

Aug 28, 2009 4:29:46 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:

f8a846c

Parents:

16506fb

Message:

• Fix endless loop on error response for APPEND command (#1486060)

Files:

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

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix endless loop on error response for APPEND command (#1486060)
 - Don't require date.timezone setting in installer (#1485989)
 - Fix date sorting problem with Courier IMAP server (#1486065)

INSTALL

@@ -39 +39 @@
 3. Create a new database and a database user for RoundCube (see DATABASE SETUP)
 4. Point your browser to http://url-to-roundcube/installer/
-5. Follow the instructions of the install script (or see MANUAL CONFINGURATION)
+5. Follow the instructions of the install script (or see MANUAL CONFIGURATION)
 6. After creating and testing the configuration, remove the installer directory
 7. Done!

program/lib/imap.inc

@@ -302 +302 @@
 
 function iil_ParseResult($string) {
-        $a = explode(' ', $string);
-        if (count($a) > 2) {
+        $a = explode(' ', trim($string));
+        if (count($a) >= 2) {
                 if (strcasecmp($a[1], 'OK') == 0) {
                         return 0;
@@ -312 +312 @@
                 } else if (strcasecmp($a[1], 'BYE') == 0) {
                         return -3;
-                }
+                }
         }
         return -4;
@@ -2126 +2126 @@
         iil_PutLine($fp, $query);
 
-        $line = trim(iil_ReadLine($fp, 10000));
-        return iil_ParseResult($line);
+        $line = trim(iil_ReadLine($fp, 512));
+        return (iil_ParseResult($line) == 0);
 }
 
@@ -2136 +2136 @@
         iil_PutLine($fp, $query);
     
-        $line = trim(iil_ReadLine($fp, 10000));
-        return iil_ParseResult($line);
+        $line = trim(iil_ReadLine($fp, 512));
+        return (iil_ParseResult($line) == 0);
 }
 
@@ -2372 +2372 @@
 function iil_C_Append(&$conn, $folder, &$message) {
         if (!$folder) {
-                return false;
+                return false;
         }
         $fp = $conn->fp;
 
         $message = str_replace("\r", '', $message);
-        $message = str_replace("\n", "\r\n", $message);         
+        $message = str_replace("\n", "\r\n", $message);
 
         $len = strlen($message);
         if (!$len) {
-                return false;
+                return false;
         }
 
         $request = 'a APPEND "' . iil_Escape($folder) .'" (\\Seen) {' . $len . '}';
-    
+
         if (iil_PutLine($fp, $request)) {
-                $line = iil_ReadLine($fp, 100);         
-                $sent = iil_PutLine($fp, $message);
+                $line = iil_ReadLine($fp, 512);
+
+                $result = (iil_ParseResult($line) == 0);
+                if (!$result) {
+                        $conn->error .= "Cannot write to folder: $line\n";
+                        return false;
+                }
+
+                iil_PutLine($fp, $message);
+
                 do {
-                        $line=iil_ReadLine($fp);
+                        $line = iil_ReadLine($fp);
                 } while (!iil_StartsWith($line, 'a ', true));
         
@@ -2396 +2404 @@
                 if (!$result) {
                     $conn->error .= $line . "\n";
-                }
+                }
                 return $result;
         }
@@ -2410 +2418 @@
     
         //open message file
-        $in_fp = false;                         
+        $in_fp = false;
         if (file_exists(realpath($path))) {
                 $in_fp = fopen($path, 'r');
@@ -2427 +2435 @@
         //send APPEND command
         $request    = 'a APPEND "' . iil_Escape($folder) . '" (\\Seen) {' . $len . '}';
-        $bytes_sent = 0;
         if (iil_PutLine($fp, $request)) {
-                $line = iil_ReadLine($fp, 100);
-                                
+                $line = iil_ReadLine($fp, 512);
+
+                $result = (iil_ParseResult($line) == 0);
+                if (!$result) {
+                        $conn->error .= "Cannot write to folder: $line\n";
+                        return false;
+                }
+
                 //send file
                 while (!feof($in_fp)) {
                         $buffer      = fgets($in_fp, 4096);
-                        $bytes_sent += strlen($buffer);
                         iil_PutLine($fp, $buffer, false);
                 }
@@ -2445 +2457 @@
                         $line = iil_ReadLine($fp);
                 } while (!iil_StartsWith($line, 'a ', true));
-                        
+
                 $result = (iil_ParseResult($line) == 0);
                 if (!$result) {
                     $conn->error .= $line . "\n";
                 }
-        
+
                 return $result;
         }