diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_message.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index 3a96a0b7b..a8c51cc4e 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -478,10 +478,21 @@ class rcube_message if (!empty($mail_part->filename)) $this->attachments[] = $mail_part; } - // is a regular attachment (content-type name regexp according to RFC4288.4.2) + // regular attachment with valid content type + // (content-type name regexp according to RFC4288.4.2) else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) { if (!$mail_part->filename) $mail_part->filename = 'Part '.$mail_part->mime_id; + + $this->attachments[] = $mail_part; + } + // attachment with invalid content type + // replace malformed content type with application/octet-stream (#1487767) + else if ($mail_part->filename) { + $mail_part->ctype_primary = 'application'; + $mail_part->ctype_secondary = 'octet-stream'; + $mail_part->mimetype = 'application/octet-stream'; + $this->attachments[] = $mail_part; } } |