diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-14 18:55:38 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-14 18:55:38 +0200 |
| commit | 519e380f637cbc8d2b5c3d7a0d34508ac17d57d8 (patch) | |
| tree | 0faa5eead671c4e47139e165dba82b27d762fae2 /plugins/managesieve | |
| parent | 413df054ad3235c59c24e897b616c569adc4f67b (diff) | |
| parent | 56689b31ae3746600b12a9c5c9ec1438e704a6e7 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins/managesieve')
| -rw-r--r-- | plugins/managesieve/Changelog | 2 | ||||
| -rw-r--r-- | plugins/managesieve/lib/Net/Sieve.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index c015ee403..482cff0ca 100644 --- 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.2 [2012-07-24] ----------------------------------------------------------- - Added GUI for variables setting - RFC5229 (patch from Paweł Słowik) diff --git a/plugins/managesieve/lib/Net/Sieve.php b/plugins/managesieve/lib/Net/Sieve.php index a8e36d8d7..8a0a9b0e1 100644 --- 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); |