[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100220: * pop3.el (pop3-open-server): Read server greeting before starting TLS negotiation.

[Chong Yidong]

------------------------------------------------------------
revno: 100220
author: Yuri Karaban <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-11-19 11:25:09 -0500
message:
  * pop3.el (pop3-open-server): Read server greeting before starting TLS 
negotiation.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/pop3.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-12 23:25:19 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-19 16:25:09 +0000
@@ -1,3 +1,8 @@
+2010-11-19  Yuri Karaban  <address@hidden>  (tiny change)
+
+       * pop3.el (pop3-open-server): Read server greeting before starting TLS
+       negotiation.
+
 2010-10-12  Juanma Barranquero  <address@hidden>
 
        * nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring.

=== modified file 'lisp/gnus/pop3.el'
--- a/lisp/gnus/pop3.el 2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/pop3.el 2010-11-19 16:25:09 +0000
@@ -259,21 +259,22 @@
              ;; 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