Changeset 4064452 in github

Timestamp:

Dec 8, 2010 9:24:53 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

ad399a9

Parents:

90f81a6

Message:

• Fix handling of untagged responses for AUTHENTICATE command (#1487450)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap_generic.php (modified) (6 diffs)

CHANGELOG

@@ -19 +19 @@
 - Better support for READ-ONLY and NOPERM responses handling (#1487083)
 - Add confirmation message on purge/expunge command response
+- Fix handling of untagged responses for AUTHENTICATE command (#1487450)
 
 RELEASE 0.5-BETA

program/include/rcube_imap_generic.php

@@ -283 +283 @@
     }
 
-    // don't use it in loops, until you exactly know what you're doing
     function readReply(&$untagged=null)
     {
@@ -422 +421 @@
 
                     $this->putLine($this->nextTag() . " AUTHENTICATE $type");
-                    $line = trim($this->readLine(1024));
+                    $line = trim($this->readReply());
 
                     if ($line[0] == '+') {
@@ -472 +471 @@
                 // send result
                 $this->putLine($reply);
-                $line = $this->readLine(1024);
+                $line = trim($this->readReply());
 
                 if ($line[0] == '+') {
@@ -492 +491 @@
             }
 
-            $line = $this->readLine(1024);
+            $line = $this->readReply();
             $result = $this->parseResult($line);
         }
@@ -514 +513 @@
             else {
                     $this->putLine($this->nextTag() . " AUTHENTICATE PLAIN");
-                    $line = trim($this->readLine(1024));
+                    $line = trim($this->readReply());
 
                         if ($line[0] != '+') {
@@ -522 +521 @@
                 // send result, get reply and process it
                 $this->putLine($reply);
-                $line = $this->readLine(1024);
+                $line = $this->readReply();
                 $result = $this->parseResult($line);
             }