diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-02 12:47:48 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-02 12:47:48 +0000 |
| commit | fcb368cc3bc3ec94874a4b6e123b010544c34ec9 (patch) | |
| tree | 885969a05cfec4fe394f25f04c8b522bd887def0 | |
| parent | 30d04f400d39773144da53427f2541ea14bc0930 (diff) | |
- last change fix
git-svn-id: https://svn.roundcube.net/trunk@1714 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index 9402dfb4f..a2564de87 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -298,7 +298,7 @@ function iil_Escape($string) function iil_C_GetCapability(&$conn, $name) { if (in_array($name, $conn->capability)) { - return $conn->capability[$name]; + return true; } else if ($conn->capability_readed) { return false; @@ -323,7 +323,7 @@ function iil_C_GetCapability(&$conn, $name) $conn->capability_readed = true; if (in_array($name, $conn->capability)) { - return $conn->capability[$name]; + return true; } return false; @@ -548,13 +548,15 @@ function iil_Connect($host, $user, $password) { } $iil_error .= "Socket connection established\r\n"; - $line = iil_ReadLine($conn->fp, 1024); + $line = iil_ReadLine($conn->fp, 4096); // RFC3501 [7.1] optional CAPABILITY response if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) { $conn->capability = explode(' ', strtoupper($matches[1])); } + $conn->message .= $line; + if (strcasecmp($auth_method, "check") == 0) { //check for supported auth methods if (iil_C_GetCapability($conn, 'AUTH=CRAM-MD5') || iil_C_GetCapability($conn, 'AUTH=CRAM_MD5')) { |