From b95775bc81748368cb104852b8b9331b0191735c Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 29 Sep 2010 22:23:25 +0200 Subject: [PATCH] Revert the auto-network->starttls code. If the user has requested network, that's what they ought to get. --- lisp/ChangeLog | 4 ++++ lisp/nnimap.el | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58e17f62e..1aa612856 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-09-29 Lars Magne Ingebrigtsen + * nnimap.el (nnimap-open-connection): Revert the auto-network->starttls + code, since if the user has requested network, that's what they ought + to get. + * pop3.el (pop3-send-streaming-command, pop3-stream-length): New variable. diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 5e5514277..618db2bb5 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -342,15 +342,6 @@ textual parts.") (when (eq nnimap-stream 'starttls) (nnimap-command "STARTTLS") (starttls-negotiate (nnimap-process nnimap-object))) - ;; If this is a STARTTLS-capable server, then sever the - ;; connection and start a STARTTLS connection instead. - (when (and (eq nnimap-stream 'network) - (member "STARTTLS" (nnimap-capabilities nnimap-object))) - (let ((nnimap-stream 'starttls)) - (delete-process (nnimap-process nnimap-object)) - (kill-buffer (current-buffer)) - (return - (nnimap-open-connection buffer)))) (when nnimap-server-port (push (format "%s" nnimap-server-port) ports)) (unless (equal connection-result "PREAUTH") -- 2.25.1