From 19332495b04e6df80ace5291ea75cd2e979a8e19 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 6 Aug 2018 15:30:29 +0200 Subject: [PATCH] Fix so fallback from BINARY to BODY FETCH is used also on [PARSE] errors in dovecot 2.3 (#6383) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_imap_generic.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 96c906659..680b75201 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -91,6 +91,7 @@ CHANGELOG Roundcube Webmail - Fix so links over images are not removed in plain text signatures converted from HTML (#4473) - Fix various issues when downloading files with names containing non-ascii chars, use RFC 2231 (#5772) - Fix PHP warnings on dummy QUOTA responses in Courier-IMAP 4.17.1 (#6374) +- Fix so fallback from BINARY to BODY FETCH is used also on [PARSE] errors in dovecot 2.3 (#6383) RELEASE 1.3.7 ------------- diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index ef84ec704..6c637b90f 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -2822,7 +2822,7 @@ class rcube_imap_generic } // handle UNKNOWN-CTE response - RFC 3516, try again with standard BODY request - if ($binary && !$found && preg_match('/^' . $key . ' NO \[UNKNOWN-CTE\]/i', $line)) { + if ($binary && !$found && preg_match('/^' . $key . ' NO \[(UNKNOWN-CTE|PARSE)\]/i', $line)) { $binary = $initiated = false; continue; }