Re: bug#21043: [PATCH] nnimap.el: make capability parsing more robust.

[Nikolaus Rath <Nikolaus@rath.org>]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

On Jul 13 2015, Eric Abrahamsen <eric@ericabrahamsen.net> wrote:
> Nikolaus Rath <Nikolaus@rath.org> writes:
>
>> Package: gnus
>> Tags: patch
>
> There was no patch!

Oops. Here it is.

-- 
GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F

             »Time flies like an arrow, fruit flies like a Banana.«

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-nnimap.el-make-capability-parsing-more-robust.patch --]
[-- Type: text/x-diff, Size: 1532 bytes --]

From 241812047dedb1ba7d362c4211a06bf506d37237 Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Sun, 12 Jul 2015 18:42:48 -0700
Subject: [PATCH] nnimap.el: make capability parsing more robust.

* lisp/nnimap.el (nnimap-open-connection-1): explicitly ask server for
capabilities instead of relying on LOGIN response.
---
 lisp/ChangeLog | 5 +++++
 lisp/nnimap.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8ab42e..83ac4c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-07-12 Nikolaus Rath <Nikolaus@rath.org>
 
+	* nnimap.el (nnimap-open-connection-1): explicitly ask server for
+	capabilities instead of relying on LOGIN response.
+
+2015-07-12 Nikolaus Rath <Nikolaus@rath.org>
+
 	* nnimap.el (nnimap-request-group-scan)
 	(nnimap-request-create-group, nnimap-request-delete-group)
 	(nnimap-request-rename-group, nnimap-request-move-article)
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index d11b3a2..19632ad 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -520,7 +520,7 @@ If non-nil, articles flagged as deleted (using the IMAP
 			(funcall (nth 2 credentials)))
 		      ;; See if CAPABILITY is set as part of login
 		      ;; response.
-		      (dolist (response (cddr login-result))
+		      (dolist (response (cddr (nnimap-command "CAPABILITY")))
 			(when (string= "CAPABILITY" (upcase (car response)))
 			  (setf (nnimap-capabilities nnimap-object)
 				(mapcar #'upcase (cdr response))))))
-- 
2.1.4