Changeset 4128 in subversion

Timestamp:

Oct 25, 2010 3:45:35 AM (3 years ago)

Author:

alec

Message:

• Improve performance by reading optional capability response from AUTHENTICATE

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -120 +120 @@
 
     const COMMAND_NORESPONSE = 1;
+    const COMMAND_CAPABILITY = 2;
 
     /**
@@ -477 +478 @@
             // RFC 4959 (SASL-IR): save one round trip
             if ($this->getCapability('SASL-IR')) {
-                $result = $this->execute("AUTHENTICATE PLAIN", array($reply), self::COMMAND_NORESPONSE);
+                $result = $this->execute("AUTHENTICATE PLAIN", array($reply),
+                    self::COMMAND_NORESPONSE | self::COMMAND_CAPABILITY);
             }
             else {
@@ -495 +497 @@
 
         if ($result == self::ERROR_OK) {
+            // optional CAPABILITY response
+                if ($line && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
+                        $this->parseCapability($matches[1]);
+                }
             return $this->fp;
         }
@@ -515 +521 @@
     {
         list($code, $response) = $this->execute('LOGIN', array(
-            $this->escape($user), $this->escape($password)));
+            $this->escape($user), $this->escape($password)), self::COMMAND_CAPABILITY);
 
         // re-set capabilities list if untagged CAPABILITY response provided
@@ -2803 +2809 @@
         }
 
+            // optional CAPABILITY response
+            if (($options & self::COMMAND_CAPABILITY) && $code == self::ERROR_OK
+            && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)
+        ) {
+                    $this->parseCapability($matches[1]);
+            }
+
             return $noresp ? $code : array($code, $response);
     }