Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-04 05:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable', resolving conflicts

Browse Source
This commit is contained in:
link2xt
2023-10-01 00:44:37 +00:00
parent 5daa6274e8 53230b6eb0
commit 59e5a63d5f
12 changed files with 126 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mimeparser.rs
View File

@@ -804,18 +804,6 @@ impl MimeMessage {
// Boxed future to deal with recursion
async move {
if mail.ctype.params.get("protected-headers").is_some() {
if mail.ctype.mimetype == "text/rfc822-headers" {
warn!(
context,
"Protected headers found in text/rfc822-headers attachment: Will be ignored.",
);
return Ok(false);
}
warn!(context, "Ignoring nested protected headers");
}
enum MimeS {
Multiple,
Single,
@@ -852,7 +840,10 @@ impl MimeMessage {
self.parse_mime_recursive(context, &mail, is_related).await
}
MimeS::Single => self.add_single_part_if_known(context, mail, is_related).await,
MimeS::Single => {
self.add_single_part_if_known(context, mail, is_related)
.await
}
}
}
.boxed()