mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 10:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge 3.4

Browse Source
This commit is contained in:
Benjamin Peterson 2016-06-11 13:18:56 -07:00
commit b0557e729e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/smtplib.py
View File

@ -773,6 +773,11 @@ class SMTP:
self.ehlo_resp = None self.ehlo_resp = None
self.esmtp_features = {} self.esmtp_features = {}
self.does_esmtp = 0 self.does_esmtp = 0
else:
# RFC 3207:
# 501 Syntax error (no parameters allowed)
# 454 TLS not available due to temporary reason
raise SMTPResponseException(resp, reply)
return (resp, reply) return (resp, reply)
def sendmail(self, from_addr, to_addrs, msg, mail_options=[], def sendmail(self, from_addr, to_addrs, msg, mail_options=[],

3
Misc/NEWS
View File

@ -139,6 +139,9 @@ Core and Builtins
Library Library
------- -------
- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772. Reported by Team
Oststrom
- Issue #21386: Implement missing IPv4Address.is_global property. It was - Issue #21386: Implement missing IPv4Address.is_global property. It was
documented since 07a5610bae9d. Initial patch by Roger Luethi. documented since 07a5610bae9d. Initial patch by Roger Luethi.