Page MenuHomePhabricator

Fix inbound mail handling for messages with no HTML body part

Authored by epriestley on Nov 22 2017, 3:45 PM.



See D18776. See

The change in D18776 to improve handling of non-utf8 HTML parts broke handling of mail with no HTML parts. Partly, this is because MimeMailParser has a "traditional" PHP-style API where the return type is an exciting surprise.

Test Plan
  • Sent a text-only message in
  • Used "Show Raw" to copy it to mail.txt, verifying that the raw message contains ONLY a text body.
  • Ran cat mail.txt | ./scripts/mail/mail_handler.php --trace --process-duplicates.
    • Before patch: error about bad idx() on a non-array.
    • After patch: clean mail processing.
  • Did the same with a message with both HTML and text bodies to make sure I didn't break anything.

Ideally we'd probably get test coverage on this, but it's been touched roughly once a year since 2013 so it'll probably hold.

Diff Detail

rP Phabricator
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Nov 22 2017, 3:45 PM
epriestley requested review of this revision.Nov 22 2017, 3:46 PM
amckinley accepted this revision.Nov 22 2017, 6:39 PM
This revision is now accepted and ready to land.Nov 22 2017, 6:39 PM
alexmv accepted this revision.Nov 22 2017, 6:46 PM

Sorry for the breakage!

This revision was automatically updated to reflect the committed changes.