Skip to content

Fix binary attachment and Content-Disposition header handling #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacekkow wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −5
Open

Fix binary attachment and Content-Disposition header handling #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f568715
Do not normalize attachment content
jacekkow May 22, 2026
129f657
Make Content-Disposition header value parsing case-insensitive
jacekkow May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/MessagePart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,17 @@ public function getContentType(): string

public function getContent(): string
{
$content = $this->content;

if (strtolower($this->getHeader('Content-Transfer-Encoding', '')) === 'base64') {
return Utils::normaliseLineEndings(base64_decode($this->content));
$content = base64_decode($content);
}

if ($this->isAttachment()) {
return $content;
}

return Utils::normaliseLineEndings($this->content);
return Utils::normaliseLineEndings($content);
}

public function isHtml(): bool
Expand All @@ -123,16 +129,16 @@ public function isImage(): bool

public function isAttachment(): bool
{
return str_starts_with($this->getHeader('Content-Disposition', ''), 'attachment');
return str_starts_with(strtolower($this->getHeader('Content-Disposition', '')), 'attachment');
}

public function getFilename(): string
{
if (preg_match('/filename=([^;]+)/', $this->getHeader('Content-Disposition'), $matches)) {
if (preg_match('/filename=([^;]+)/i', $this->getHeader('Content-Disposition'), $matches)) {
return trim($matches[1], '"');
}

if (preg_match('/name=([^;]+)/', $this->getContentType(), $matches)) {
if (preg_match('/name=([^;]+)/i', $this->getContentType(), $matches)) {
return trim($matches[1], '"');
}

Expand Down