lib/PublicInbox/Hval.pm | 1 - lib/PublicInbox/View.pm | 5 +---- public-inbox.cgi | 2 +- diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 26a2d0bb018f631dbd117af8da36bbe9d86ac7e8..47b41a5844c875ddff9eeabf271485025a157f68 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -12,7 +12,6 @@ use URI::Escape qw(uri_escape); my $enc_utf8 = find_encoding('utf8'); my $enc_ascii = find_encoding('us-ascii'); -my $enc_mime = find_encoding('MIME-Header'); sub new { my ($class, $raw) = @_; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index ecd49156aeb2651561b43cbec18000610ef142cb..811e4703e5ee5e1588739cab9f55d6bffb504683 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -11,6 +11,7 @@ use Encode::MIME::Header; use Email::MIME::ContentType qw/parse_content_type/; use constant MAX_INLINE_QUOTED => 5; use constant MAX_TRUNC_LEN => 72; +*ascii_html = *PublicInbox::Hval::ascii_html; my $enc_utf8 = find_encoding('utf8'); my $enc_ascii = find_encoding('us-ascii'); @@ -134,10 +135,6 @@ $cur; } !emg; $s; -} - -sub ascii_html { - $enc_ascii->encode(escapeHTML($_[0]), Encode::HTMLCREF); } sub headers_to_html_header { diff --git a/public-inbox.cgi b/public-inbox.cgi index fc48f2f4416a42c7345ee5c2e4db0cd9f51b57bb..9bc3dc2b5477e80b49dce18abd5892c4d8903e7d 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -168,7 +168,7 @@ my $x = mid2blob($ctx); return r404() unless $x; require PublicInbox::View; - my $mid_href = PublicInbox::View::ascii_html(uri_escape($ctx->{mid})); + my $mid_href = PublicInbox::Hval::ascii_html(uri_escape($ctx->{mid})); my $pfx = "../f/$mid_href.html"; require Email::MIME; [ "200 OK", {'Content-Type' => 'text/html'},