From 03a63a4a032c1202ddfa4fba53c091953659b153 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 30 Jul 2009 07:56:10 -0400
Subject: [PATCH] - Fix endless loop in iil_C_Login() with Courier IMAP (#1486010)
---
CHANGELOG | 1 +
program/lib/imap.inc | 23 +++++++++++------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8c6a5d1..673f8f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- 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
- Fix charset names with X- prefix handling
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 514e227..7fb63c9 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -243,6 +243,7 @@
do {
$buffer = fgets($fp, $size);
+
if ($buffer === false) {
break;
}
@@ -250,7 +251,7 @@
write_log('imap', 'S: '. chop($buffer));
$line .= $buffer;
} while ($buffer[strlen($buffer)-1] != "\n");
-
+
return $line;
}
@@ -290,11 +291,12 @@
return $data;
}
+// 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;
}
@@ -442,13 +444,8 @@
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);
@@ -589,7 +586,6 @@
} else if ($my_prefs['sort_field'] == 'DATE') {
$IMAP_USE_INTERNAL_DATE = false;
}
- //echo '<!-- conn sort_field: '.$my_prefs['sort_field'].' //-->';
//check input
if (empty($host)) {
@@ -626,6 +622,9 @@
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?
if (!preg_match('/^\* (OK|PREAUTH)/i', $line)) {
if ($line)
@@ -635,7 +634,7 @@
$iil_errornum = -2;
return false;
}
-
+
// RFC3501 [7.1] optional CAPABILITY response
if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
$conn->capability = explode(' ', strtoupper($matches[1]));
@@ -1833,7 +1832,7 @@
$c=0;
iil_PutLine($fp, "cpy1 UID COPY $messages \"".iil_Escape($to)."\"");
- $line=iil_ReadReply($fp);
+ $line = iil_ReadReply($fp);
return iil_ParseResult($line);
} else {
return -1;
--
Gitblit v1.9.1