Fix SORT and THREAD command when UTF8=ACCEPT.

Looks like Errata 4029 was misinterpreted here. SORT and THREAD have mandatory charset requirements, therefore we MUST send the UTF-8 specifier.
horde · Mar 2, 2019 · 8658aa5 · 8658aa5
1 parent 4bd22d8
commit 8658aa5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib/Horde/Imap/Client/Socket.php b/lib/Horde/Imap/Client/Socket.php
@@ -2405,10 +2405,12 @@ protected function _search($query, $options)
             $cmd->add($tmp);
 
             /* Charset is mandatory for SORT (RFC 5256 [3]).
-             * However, if UTF-8 support is activated, a client MUST NOT
-             * send the charset specification (RFC 6855 [3]; Errata 4029). */
+             * If UTF-8 support is activated, a client MUST ONLY
+             * send the 'UTF-8' specification (RFC 6855 [3]; Errata 4029). */
             if (!$this->_capability()->isEnabled('UTF8=ACCEPT')) {
                 $cmd->add($charset);
+            } else {
+                $cmd->add('UTF-8');
             }
         } else {
             $cmd = $this->_command(
@@ -2753,11 +2755,14 @@ protected function _thread($options)
             empty($options['sequence']) ? 'UID THREAD' : 'THREAD'
         )->add($tsort);
 
-        /* If UTF-8 support is activated, a client MUST NOT
-         * send the charset specification (RFC 6855 [3]; Errata 4029). */
+        /* If UTF-8 support is activated, a client MUST send the UTF-8
+         * charset specification since charset is mandatory for this
+         * command (RFC 6855 [3]; Errata 4029). */
         if (empty($options['search'])) {
             if (!$this->_capability()->isEnabled('UTF8=ACCEPT')) {
                 $cmd->add('US-ASCII');
+            } else {
+                $cmd->add('UTF-8');
             }
             $cmd->add('ALL');
         } else {