Changeset 2273 in subversion

Timestamp:

Feb 5, 2009 12:43:54 PM (4 years ago)

Author:

alec

Message:

• Support NGINX as IMAP backend: better BAD response handling (#1485720)

Location:

trunk/roundcubemail

Files:

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

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2009/02/05 (alec)
+----------
+- Support NGINX as IMAP backend: better BAD response handling (#1485720)
 
 2009/02/04 (alec)

trunk/roundcubemail/program/lib/imap.inc

@@ -69 +69 @@
                 - added iil_PutLineC() 
                 - fixed iil_C_Sort() to support very long and/or divided responses
-                - added BYE response simple support for endless loop prevention
+                - added BYE/BAD response simple support for endless loop prevention
                 - added 3rd argument in iil_StartsWith* functions
                 - fix iil_C_FetchPartHeader() in some cases by use of iil_C_HandlePartBody()
@@ -308 +308 @@
 }
 
-// check if $string starts with $match
-function iil_StartsWith($string, $match, $bye=false) {
+// check if $string starts with $match (or * BYE/BAD)
+function iil_StartsWith($string, $match, $error=false) {
         $len = strlen($match);
         if ($len == 0) {
@@ -317 +317 @@
                 return true;
         }
-        if ($bye && strncmp($string, '* BYE ', 6) == 0) {
+        if ($error && preg_match('/^\* (BYE|BAD) /', $string)) {
                 return true;
         }