summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-08-14 09:59:54 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-08-14 09:59:54 +0200
commitc0aedfa34a641d5116ae8b8d5c1009c54ffee3b0 (patch)
tree88023e3ca3411cf9a38be277949676a8a1a2a48e /plugins
parent8faaa7d1d07990c36c92fe251a9296ca988cdeff (diff)
parent2922b727e81ca25717f48da4baff3e74594821b0 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
-rw-r--r--plugins/managesieve/Changelog2
-rw-r--r--plugins/managesieve/lib/Net/Sieve.php4
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);