summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-01-26 04:31:58 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-01-26 04:31:58 (GMT)
commit60a2f49c8cfeb632d38c7ffb8db622049e760a54 (patch)
tree8336202c76d0838826a8d4d4d35d3d1b97198039 /Misc
parentb335dfe7fa95c8c68630e8f7dc738c7b66637e87 (diff)
parent155ceaa454ad9a623cade5ed326e6e1e70ce109d (diff)
downloadcpython-60a2f49c8cfeb632d38c7ffb8db622049e760a54.zip
cpython-60a2f49c8cfeb632d38c7ffb8db622049e760a54.tar.gz
cpython-60a2f49c8cfeb632d38c7ffb8db622049e760a54.tar.bz2
merge 3.4 (#19996)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3c08363..370c228 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -215,6 +215,9 @@ Core and Builtins
Library
-------
+- Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed)
+ headers with no key rather than amusing the body has started.
+
- Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl
module.