Synch with flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index 2641634..4b26924 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-30  AMAKAWA Shuhei <sa264@cam.ac.uk>
+
+       * smtp.el(smtp-submit-package): Send EHLO after starttls.
+
 2001-06-07  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * mime-def.el (mime-library-product): 1.14.3 (Terai-Nishikuchi).

diff --git a/smtp.el b/smtp.el
index cc695a9..23db68d 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -295,7 +295,9 @@ BUFFER may be a buffer or a buffer name which contains mail message."
          (smtp-response-error
           (smtp-primitive-helo package)))
        (if smtp-use-starttls
-           (smtp-primitive-starttls package))
+           (progn
+             (smtp-primitive-starttls package)
+             (smtp-primitive-ehlo package)))
        (if smtp-use-sasl
            (smtp-primitive-auth package))
        (smtp-primitive-mailfrom package)