Unverified Commit 595ef7f4 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #410 from pveith/sympa-6.2 by pveith

In Sub _merge_msg Content-Disposition: attachement in multipart-messages will be copied without modification.
parents 8ef66e87 9422095d
...@@ -1262,6 +1262,13 @@ sub _merge_msg { ...@@ -1262,6 +1262,13 @@ sub _merge_msg {
return $entity; return $entity;
} }
# Check for attchment-part, which should not be changed
my $cdisposition = $entity->head->mime_attr('Content-Disposition');
if ($cdisposition and lc($cdisposition) eq 'attachment') {
$log->syslog('notice', 'Detected part with Content-Disposition. Not changing it!');
return $entity;
if ($entity->parts) { if ($entity->parts) {
foreach my $part ($entity->parts) { foreach my $part ($entity->parts) {
unless (_merge_msg($part, $list, $rcpt, $data)) { unless (_merge_msg($part, $list, $rcpt, $data)) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment