Changeset 587444f in github

Timestamp:

Sep 20, 2009 5:09:36 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:

67bb96f

Parents:

f8dae9f

Message:

• Fix "Empty startup greeting" bug (#1486085)

Files:

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

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix "Empty startup greeting" bug (#1486085)
 - Fix setting user name in 'new_user_identity' plugin (#1486137)
 - Fix incorrect count of new messages in folder list when using multiple IMAP clients (#1485995)

program/lib/imap.inc

@@ -613 +613 @@
         }
 
-        $conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
+        $conn->fp = @fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
         if (!$conn->fp) {
                 $iil_error = "Could not connect to $host at port $ICL_PORT: $errstr";
@@ -621 +621 @@
 
         stream_set_timeout($conn->fp, 10);
-        $line = stream_get_line($conn->fp, 8192, "\n");
+        $line = trim(fgets($conn->fp, 8192));
 
         if ($my_prefs['debug_mode'] && $line)
@@ -641 +641 @@
         }
 
-        $conn->message .= $line;
+        $conn->message .= $line . "\n";
 
         // TLS connection
@@ -705 +705 @@
         }
                 
-        if ((!$result)||(strcasecmp($auth, "plain") == 0)) {
+        if (!$result || strcasecmp($auth, "plain") == 0) {
                 //do plain text auth
                 $result = iil_C_Login($conn, $user, $password);