Permalink
Browse files

Merge branch 'release-0.7' of github.com:roundcube/roundcubemail into…

… release-0.7
  • Loading branch information...
2 parents d063993 + 872d209 commit da0c480b9d4082717ee20a254c17c892799cfbc8 @thomascube thomascube committed Aug 15, 2012
Showing with 5 additions and 1 deletion.
  1. +2 −0 plugins/managesieve/Changelog
  2. +3 −1 plugins/managesieve/lib/Net/Sieve.php
View
2 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
View
4 plugins/managesieve/lib/Net/Sieve.php
@@ -1098,7 +1098,9 @@ function _doCmd($cmd = '', $auth = false)
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);

0 comments on commit da0c480

Please sign in to comment.