From 0cff49fcf9b5689a8940c318ea0d846317f3a7d3 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 30 Aug 2014 16:51:59 -0400 Subject: #22215: have the smtplib 'quit' command reset the state. Without this reset, starttls would fail if a connect/starttls was done after a quit, because smtplib assumed the existing value of emspt_features was accurate, but it gets reset when starttls completes (and the new value does not contain the starttls capability, since tls is already started at that point). (There may be additional places where this lack of reset was an issue as well.) Patch by Milan Oberkirch. --- Lib/smtplib.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Lib/smtplib.py') diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 759b77e47f..09b4ea6479 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -866,6 +866,10 @@ class SMTP: def quit(self): """Terminate the SMTP session.""" res = self.docmd("quit") + # A new EHLO is required after reconnecting with connect() + self.ehlo_resp = self.helo_resp = None + self.esmtp_features = {} + self.does_esmtp = False self.close() return res -- cgit v1.2.1