Add workaround for broken DBMail versions.

horde · Jan 30, 2015 · b2a327c · b2a327c
1 parent bb20fa7
commit b2a327c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/framework/ManageSieve/lib/Horde/ManageSieve.php b/framework/ManageSieve/lib/Horde/ManageSieve.php
@@ -976,7 +976,9 @@ protected function _doCmd($cmd = '', $auth = false)
 
                 if (preg_match('/^(OK|NO)/i', $line, $tag)) {
                     // Check for string literal message.
-                    if (preg_match('/{([0-9]+)}$/', $line, $matches)) {
+                    // DBMail has some broken versions that send the trailing
+                    // plus even though it's disallowed.
+                    if (preg_match('/{([0-9]+)\+?}$/', $line, $matches)) {
                         $line = substr($line, 0, -(strlen($matches[1]) + 2))
                             . str_replace(
                                 "\r\n", ' ', $this->_recvBytes($matches[1] + 2)