Wait for the response to STARTTLS before starting negotiation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 920151e..ad72d62 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS
+       before starting negotiation.
+
        * gnus-art.el (gnus-treat-from-gravatar): Change default to nil for
        privacy reasons.
        (gnus-treat-mail-gravatar): Ditto.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 16a4342..000855d 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -310,7 +310,7 @@ not done by default on servers that doesn't support that command.")
        (gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
        (when (setq connection-result (nnimap-wait-for-connection))
          (when (eq nnimap-stream 'starttls)
-           (nnimap-send-command "STARTTLS")
+           (nnimap-command "STARTTLS")
            (starttls-negotiate (nnimap-process nnimap-object)))
          (unless (equal connection-result "PREAUTH")
            (if (not (setq credentials