If the user has requested network, that's what they ought to get.
2010-09-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
2010-09-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
+ * 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.
* pop3.el (pop3-send-streaming-command, pop3-stream-length): New
variable.
(when (eq nnimap-stream 'starttls)
(nnimap-command "STARTTLS")
(starttls-negotiate (nnimap-process nnimap-object)))
(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")
(when nnimap-server-port
(push (format "%s" nnimap-server-port) ports))
(unless (equal connection-result "PREAUTH")