use 5.008;
use strict;
use warnings;
-use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat
-use Encode qw(decode_utf8);
+use CGI qw(:cgi -nosticky); # PSGI/FastCGI/mod_perl compat
+use Encode qw(find_encoding);
use PublicInbox::Config;
use URI::Escape qw(uri_escape uri_unescape);
+my $enc_utf8 = find_encoding('UTF-8');
our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
our $pi_config;
BEGIN {
if ($cgi->request_method !~ /\AGET|HEAD\z/) {
return r("405 Method Not Allowed");
}
- my $path_info = decode_utf8($cgi->path_info);
+ my $path_info = $enc_utf8->decode($cgi->path_info);
# top-level indices and feeds
if ($path_info eq "/") {
} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx, $cgi);
- # convenience redirect
+ # convenience redirects, order matters
} elsif ($path_info =~ m!$LISTNAME_RE/(?:m|f)/(\S+)\z!o) {
invalid_list_mid(\%ctx, $1, $2) || redirect_mid(\%ctx, $cgi);
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'},
# no way to validate raw messages, mixed encoding is possible.
binmode STDOUT;
} else { # strict encoding for HTML and XML
- binmode STDOUT, ':encoding(UTF-8)';
+ binmode STDOUT, ':encoding(us-ascii)';
}
}