* pop3.el (pop3-open-server): Read server greeting before starting TLS negotiation.

2 files changed, 16 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e6024b3e95e..7350cf97f50 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-19  Yuri Karaban  <tech@askold.net>  (tiny change)
+
+        * pop3.el (pop3-open-server): Read server greeting before starting TLS
+        negotiation.
+
 2010-10-12  Juanma Barranquero  <lekktu@gmail.com>
 
         * nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index b3012b4b198..b445b8979ea 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -259,21 +259,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))
-             (t 
+              ;; 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"))))
       process)))
 
 ;; Support functions