From 50e96834af66f71dd05af88cab55f7a00331c813 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Tue, 17 Mar 2009 23:14:50 +0000
Subject: [PATCH] fix TLS handling with some SMTP servers (issues 2484879 and
 1912923)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4208 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt       | 1 +
 roundup/mailer.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 56a4e26..7155fb2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Fixes:
 - bug introduced into CVS export and view
 - bugs introduced in the migration to the email package (issue 2550531)
 - handle bogus pagination values (issue 2550530)
+- fix TLS handling with some SMTP servers (issues 2484879 and 1912923)
 
 
 2009-03-13 1.4.7 (r4202)
diff --git a/roundup/mailer.py b/roundup/mailer.py
index f52e20c..0d801bc 100644
--- a/roundup/mailer.py
+++ b/roundup/mailer.py
@@ -214,6 +214,7 @@ class SMTPConnection(smtplib.SMTP):
 
         # start the TLS if requested
         if config["MAIL_TLS"]:
+            self.ehlo()
             self.starttls(config["MAIL_TLS_KEYFILE"],
                 config["MAIL_TLS_CERTFILE"])
 
-- 
2.30.2