Changeset 4495 in subversion

Timestamp:

Feb 4, 2011 11:50:05 AM (2 years ago)

Author:

alec

Message:

• Fix STARTTLS for timsieved < 2.3.10

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• lib/Net/Sieve.php (modified) (1 diff)

trunk/plugins/managesieve/Changelog

@@ +1 @@
+- Fix STARTTLS for timsieved < 2.3.10
+
 * version 3.0 [2011-02-01]
 -----------------------------------------------------------

trunk/plugins/managesieve/lib/Net/Sieve.php

@@ -1162 +1162 @@
         // The server should be sending a CAPABILITY response after
         // negotiating TLS. Read it, and ignore if it doesn't.
-        $this->_doCmd();
+        // Doesn't work with older timsieved versions
+        $regexp = '/^CYRUS TIMSIEVED V([0-9.]+)/';
+        if (!preg_match($regexp, $this->_capability['implementation'], $matches)
+            || version_compare($matches[1], '2.3.10', '>=')
+        ) {
+            $this->_doCmd();
+        }
 
         // RFC says we need to query the server capabilities again now that we