If STARTTLS failed, then just open a normal connection.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2319ef7..96e6e46 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,8 @@
        that what we've checked for.
        (proto-stream-always-use-starttls): Only default to t if
        open-gnutls-stream exists.
+       (proto-stream-open-network): If STARTTLS failed, then just open a
+       normal connection.
 
        * nntp.el (nntp-open-connection): Report what the connection error is.
 

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 6f4b019..c1acf4b 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -148,7 +148,16 @@ command to switch on STARTTLS otherwise."
          (proto-stream-command stream starttls-command eoc)
          (if (fboundp 'open-gnutls-stream)
              (gnutls-negotiate stream nil)
-           (starttls-negotiate stream))
+           (unless (starttls-negotiate stream)
+             (delete-process stream)
+             (setq stream nil)))
+         (when (or (null stream)
+                   (not (memq (process-status stream)
+                              '(open run))))
+           ;; It didn't successfully negotiate STARTTLS, so we reopen
+           ;; the connection.
+           (setq stream (open-network-stream name buffer host service))
+           (proto-stream-get-response stream start eoc))
          ;; Re-get the capabilities, since they may have changed
          ;; after switching to TLS.
          (list stream greeting