Philippe M. Chiasson (:gozer) Assignee
	Description • 9 years ago

Bugzilla has a work-around in it's usage of Email::MIME, ensuring RFC2822 compliance with CRLF line endings.

However, since Email::MIME 1.911, the issue has been resolved.

Feels like the best thing to do would be to bump up the requirements to a newer version of Email::MIME without the bug and remove the workaround.

However, right now, attaching a small patch that makes the workaround conditional on the installed version of Email::MIME, so it should be forward-compatible.

	:glob ✱
	Comment 1 • 9 years ago

Comment on attachment 8688966 [details] [diff] [review]
bugzilla-email-mime-crlf.patch

Review of attachment 8688966 [details] [diff] [review]:
-----------------------------------------------------------------

::: Bugzilla/Mailer.pm
@@ +80,5 @@
>          # you're running on. See http://perldoc.perl.org/perlport.html#Newlines
>          # We check for multiple CRs because of this Template-Toolkit bug:
>          # https://rt.cpan.org/Ticket/Display.html?id=43345
> +
> +        if ($Email::MIME::VERSION < 1.911) {

versions aren't real numbers - use vers_cmp() from Bugzilla::Install::Util instead

@@ +81,5 @@
>          # We check for multiple CRs because of this Template-Toolkit bug:
>          # https://rt.cpan.org/Ticket/Display.html?id=43345
> +
> +        if ($Email::MIME::VERSION < 1.911) {
> +          $msg =~ s/(?:\015+)?\012/\015\012/msg;

bugzilla uses 4 spaces for indentation

	David Lawrence [:dkl]
	Comment 3 • 9 years ago

Comment on attachment 8688978 [details] [diff] [review]
bugzilla-email-mime-crlf-v2.patch

Review of attachment 8688978 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good. will commit. r=dkl

::: Bugzilla/Mailer.pm
@@ +80,5 @@
>          # directly because Perl translates "\n" depending on what platform
>          # you're running on. See http://perldoc.perl.org/perlport.html#Newlines
>          # We check for multiple CRs because of this Template-Toolkit bug:
>          # https://rt.cpan.org/Ticket/Display.html?id=43345
> +

we can remove the extra new line.

	David Lawrence [:dkl]
	Comment 4 • 9 years ago

To ssh://gitolite3@git.mozilla.org/webtools/bmo/bugzilla.git
   0f13163..3665280  master -> master