From 44362b2c8231bf0a410076c3a3affce30a760fa0 Mon Sep 17 00:00:00 2001 From: Yuri Karaban Date: Tue, 30 Nov 2010 22:22:49 +0000 Subject: [PATCH] pop3.el (pop3-open-server): Read server greeting before starting TLS negotiation. --- lisp/ChangeLog | 5 +++++ lisp/pop3.el | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9757ff1de..c11d21d4c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -150,6 +150,11 @@ * nnimap.el (nnimap-open-connection): Use it. +2010-11-27 Yuri Karaban (tiny change) + + * pop3.el (pop3-open-server): Read server greeting before starting TLS + negotiation. + 2010-11-26 Julien Danjou * color.el: Rename various rgb functions to srgb. diff --git a/lisp/pop3.el b/lisp/pop3.el index 327c52974..eef53c279 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -327,21 +327,22 @@ Returns the process associated with the connection." ;; gnutls-cli, openssl don't accept service names (if (equal port "pop3") (setq port 110)) - (let ((process (starttls-open-stream "POP" (current-buffer) - mailhost (or port 110)))) - (pop3-send-command process "STLS") - (let ((response (pop3-read-response process t))) - (if (and response (string-match "+OK" response)) - (starttls-negotiate process) - (pop3-quit process) - (error "POP server doesn't support starttls"))) - process)) + ;; Delay STLS until server greeting is read (Bug#7438). + (starttls-open-stream "POP" (current-buffer) + mailhost (or port 110))) (t (open-network-stream "POP" (current-buffer) mailhost port)))) (let ((response (pop3-read-response process t))) (setq pop3-timestamp (substring response (or (string-match "<" response) 0) (+ 1 (or (string-match ">" response) -1))))) + (when (eq pop3-stream-type 'starttls) + (pop3-send-command process "STLS") + (let ((response (pop3-read-response process t))) + (if (and response (string-match "+OK" response)) + (starttls-negotiate process) + (pop3-quit process) + (error "POP server doesn't support starttls")))) (pop3-set-process-query-on-exit-flag process nil) process))) -- 2.25.1