Synch to flim-1_14.

diff --git a/ChangeLog b/ChangeLog
index e65bc4f..0170dad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * smtp.el (smtp-read-response): Signal an error if connection is
+       closed while reading response.  From Hiroya Murata
+       <lapis-lazuli@pop06.odn.ne.jp> [cf. <emacs-mime-ja:01978>]
+
 2004-11-20  Daiki Ueno  <ueno@unixuser.org>
 
        * ntlm.el (ntlm-ascii2unicode): Don't apply zerop to a character.

diff --git a/smtp.el b/smtp.el
index 3704d46..0fcf274 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -654,6 +654,8 @@ BUFFER may be a buffer or a buffer name which contains mail message."
     (while response-continue
       (goto-char smtp-read-point)
       (while (not (search-forward smtp-end-of-line nil t))
+       (unless (smtp-connection-opened connection)
+         (signal 'smtp-error "Connection closed"))
        (accept-process-output (smtp-connection-process-internal connection))
        (goto-char smtp-read-point))
       (if decoder