Skip to content

Fold long lines during smtp communication in Protocol\Smtp class #138

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

Closed
vladsf wants to merge 2 commits into from
Closed

Fold long lines during smtp communication in Protocol\Smtp class #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38c9dc6
Fold long lines following RFC 5322 section-2.2.3
vladsf Feb 26, 2021
ba055c4
Undo needless comment edit
vladsf Feb 26, 2021
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
8 changes: 7 additions & 1 deletion src/Protocol/Smtp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,12 +325,18 @@ public function data($data)
rewind($fp);

// max line length is 998 char + \r\n = 1000
while (($line = stream_get_line($fp, 1000, "\n")) !== false) {
// read the line up to PHP_SOCK_CHUNK_SIZE
while (($line = stream_get_line($fp, 0, "\n")) !== false) {
$line = rtrim($line, "\r");
if (isset($line[0]) && $line[0] === '.') {
// Escape lines prefixed with a '.'
$line = '.' . $line;
}
if (strlen($line) > 998) {
// Long lines are "folded" by inserting "<CR><LF><SPACE>"
// https://tools.ietf.org/html/rfc5322#section-2.2.3
$line = substr(chunk_split($line, 998, "\r\n "), 0, -3);
}
$this->_send($line);
}
fclose($fp);
Expand Down