Ignore HeaderParseError decoding header

This commit is contained in:
Stuart Gathman
2005-06-16 18:35:51 +00:00
parent 493741c81e
commit a01c5d31f1
+5 -1
View File
@@ -1,6 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# A simple milter that has grown quite a bit. # A simple milter that has grown quite a bit.
# $Log$ # $Log$
# Revision 1.9 2005/06/14 21:55:29 customdesigned
# Check internal_domains for outgoing mail.
#
# Revision 1.8 2005/06/06 18:24:59 customdesigned # Revision 1.8 2005/06/06 18:24:59 customdesigned
# Properly log exceptions from pydspam # Properly log exceptions from pydspam
# #
@@ -460,9 +463,9 @@ def parse_addr(t):
return t.split('@') return t.split('@')
def parse_header(val): def parse_header(val):
try:
h = decode_header(val) h = decode_header(val)
if not len(h) or (not h[0][1] and len(h) == 1): return val if not len(h) or (not h[0][1] and len(h) == 1): return val
try:
u = [] u = []
for s,enc in h: for s,enc in h:
if enc: if enc:
@@ -479,6 +482,7 @@ def parse_header(val):
except UnicodeError: continue except UnicodeError: continue
except UnicodeDecodeError: pass except UnicodeDecodeError: pass
except LookupError: pass except LookupError: pass
except email.errors.HeaderParseError: pass
return val return val
class bmsMilter(Milter.Milter): class bmsMilter(Milter.Milter):