_parse_headers(): Strip a trailing newline from the envelope header. Closes
SF #951088.
diff --git a/Lib/email/FeedParser.py b/Lib/email/FeedParser.py
index 0bb9271..806277f 100644
--- a/Lib/email/FeedParser.py
+++ b/Lib/email/FeedParser.py
@@ -404,6 +404,10 @@
# Check for envelope header, i.e. unix-from
if line.startswith('From '):
if lineno == 0:
+ # Strip off the trailing newline
+ mo = NLCRE_eol.search(line)
+ if mo:
+ line = line[:-len(mo.group(0))]
self._cur.set_unixfrom(line)
continue
elif lineno == len(lines) - 1: