Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)

Conflicts: plugins/managesieve/Changelog
12 years ago · 872d209bcd
parent bf73e037d6
commit 872d209bcd
2 changed files with 5 additions and 1 deletions
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@ -1,3 +1,5 @@
+- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
+
 * version 5.0 [2012-01-05]
 -----------------------------------------------------------
 - Fixed setting test type to :is when none is specified
--- a/plugins/managesieve/lib/Net/Sieve.php
+++ b/plugins/managesieve/lib/Net/Sieve.php
@ -1098,7 +1098,9 @@ class Net_Sieve
                    return PEAR::raiseError(trim($response . $line), 6);
                }

-                if (preg_match('/^{([0-9]+)}/i', $line, $matches)) {
+                // "\+?" is added in the regexp to workaround DBMail bug
+                // http://dbmail.org/mantis/view.php?id=963
+                if (preg_match('/^{([0-9]+)\+?}/i', $line, $matches)) {
                    // Matches literal string responses.
                    $line = $this->_recvBytes($matches[1] + 2);