Merge #22215: have the smtplib 'quit' command reset the state.

1 files changed, 4 insertions, 0 deletions

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index e62304ad77..6676af8086 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -891,6 +891,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