Instead, we add CRLF conversion to the only remaining place
which needs it, ViewVCS. This save many redundant ops in in
many places.
The only other place where this mattered was in
View::add_text_body, but we already started doing CRLF
conversions when we added diff parsing and link generation for
ViewVCS. Otherwise, all other places we used this was for
header viewing and Email::MIME doesn't preserve CRLF in headers.
sub ascii_html {
my ($s) = @_;
sub ascii_html {
my ($s) = @_;
- $s =~ s/\r\n/\n/sg; # fixup bad line endings
$s =~ s/([<>&'"\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
$enc_ascii->encode($s, Encode::HTMLCREF);
}
$s =~ s/([<>&'"\x7f\x00-\x1f])/$xhtml_map{$1}/sge;
$enc_ascii->encode($s, Encode::HTMLCREF);
}
# TODO: detect + convert to ensure validity
utf8::decode($$blob);
# TODO: detect + convert to ensure validity
utf8::decode($$blob);
- my $nl = ($$blob =~ tr/\n/\n/);
+ my $nl = ($$blob =~ s/\r?\n/\n/sg);
my $pad = length($nl);
$l->linkify_1($$blob);
my $pad = length($nl);
$l->linkify_1($$blob);
like($mime->body_raw, qr/hi =3D bye=/, 'our test used QP correctly');
$im->add($mime);
like($mime->body_raw, qr/hi =3D bye=/, 'our test used QP correctly');
$im->add($mime);
+ my $crlf = <<EOF;
+From: Me
+ <me\@example.com>
+To: $addr
+Message-Id: <crlf\@example.com>
+Subject: carriage
+ return
+ in
+ long
+ subject
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+:(
+EOF
+ $crlf =~ s/\n/\r\n/sg;
+ $im->add(Email::MIME->new($crlf));
+
+test_psgi($app, sub {
+ my ($cb) = @_;
+ my $res = $cb->(GET('http://example.com/test/crlf@example.com/'));
+ is($res->code, 200, 'retrieved CRLF as HTML');
+ unlike($res->content, qr/\r/, 'no CR in HTML');
+ $res = $cb->(GET('http://example.com/test/crlf@example.com/raw'));
+ is($res->code, 200, 'retrieved CRLF raw');
+ like($res->content, qr/\r/, 'CR preserved in raw message');
+});
+
# redirect with newsgroup
test_psgi($app, sub {
my ($cb) = @_;
# redirect with newsgroup
test_psgi($app, sub {
my ($cb) = @_;