(nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bd9d66..06db77c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for
+       backwards compatibility).
+
        * proto-stream.el (proto-stream-open-network): When doing opportunistic
        TLS upgrades we don't really care about the identity of the peer.
        (proto-stream-open-network): Force starttls.el to use gnutls-cli, since

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4bdf96b..1a33612 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -345,6 +345,7 @@ textual parts.")
              '("143" "993" "imap" "imaps"))
             (t
              (error "Unknown stream type: %s" nnimap-stream))))
+          (proto-stream-always-use-starttls t)
           connection-result login-result credentials)
       (when nnimap-server-port
        (push (format "%s" nnimap-server-port) ports))