summaryrefslogtreecommitdiff
path: root/service/pixelated/adapter/model
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2015-03-12 17:02:50 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-03-12 17:03:45 +0100
commite2f3f7a6922d8ca0365e93e03ab170d1ab1d575e (patch)
treea38c57ec004e9f8ec6deafc1da5e0705447f0fbd /service/pixelated/adapter/model
parent8022339834dabf5d2817157b25a2b65997989474 (diff)
Fixed problem with multi line content type header field.
- Bugfix - Issues #313, #322
Diffstat (limited to 'service/pixelated/adapter/model')
-rw-r--r--service/pixelated/adapter/model/mail.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 8521babf..c11b2aa3 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -82,7 +82,7 @@ class Mail(object):
def _parse_charset_header(self, charset_header, default_charset='utf-8'):
try:
- return re.compile('.*charset=([a-zA-Z0-9-]+)').match(charset_header).group(1)
+ return re.compile('.*charset=([a-zA-Z0-9-]+)', re.MULTILINE | re.DOTALL).match(charset_header).group(1)
except:
return default_charset