From e022d3377fd2c50fd9931bf96394728958a90bf3 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 26 Apr 2014 01:01:10 +0000
Subject: huge refactor of encoding handling

Hopefully this simplifies and corrects our usage of Perl encoding
APIs.
---
 public-inbox.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'public-inbox.cgi')

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 9bc3dc2b..3c51c314 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -12,10 +12,11 @@
 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 {
@@ -56,7 +57,7 @@ sub main {
 	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 "/") {
@@ -213,6 +214,6 @@ sub set_binmode {
 		# 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)';
 	}
 }
-- 
cgit v1.2.3-24-ge0c7