cgi: set charset in responses

[public-inbox.git] / public-inbox.cgi

diff --git a/public-inbox.cgi b/public-inbox.cgi
index ffd6ec08f4a898f9712469ad45391cc98fe3c379..1d43b86fb0563061fdb5d8283e0419866ba5ac22 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -15,12 +15,15 @@ use warnings;
 use PublicInbox::Config;
 use URI::Escape qw(uri_escape_utf8 uri_unescape);
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
+our $NO_SCRIPT_NAME; # for prettier redirects with mod_perl2
 our $pi_config;
 BEGIN {
        $pi_config = PublicInbox::Config->new;
        # TODO: detect and reload config as needed
+       $NO_SCRIPT_NAME = 1 if $ENV{NO_SCRIPT_NAME};
        if ($ENV{MOD_PERL}) {
                require CGI;
+               no warnings;
                $CGI::NOSTICKY = 1;
                CGI->compile;
        }
@@ -35,6 +38,7 @@ if ($ENV{PI_PLACKUP}) {
        # so nuke it since CGI.pm functions without it.
        require CGI;
        delete $ENV{REQUEST_URI};
+       $ENV{SCRIPT_NAME} = '' if $NO_SCRIPT_NAME;
        my $req = CGI->new;
        my $ret = main($req, $req->request_method);
        binmode STDOUT;
@@ -128,7 +132,7 @@ sub get_atom {
 sub get_index {
        my ($ctx, $cgi, $top) = @_;
        require PublicInbox::Feed;
-       [ 200, [ 'Content-Type' => 'text/html' ],
+       [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
          [ PublicInbox::Feed->generate_html_index({
                        git_dir => $ctx->{git_dir},
                        listname => $ctx->{listname},
@@ -142,13 +146,24 @@ sub get_index {
 # just returns a string ref for the blob in the current ctx
 sub mid2blob {
        my ($ctx) = @_;
-       local $ENV{GIT_DIR} = $ctx->{git_dir};
        require Digest::SHA;
        my $hex = Digest::SHA::sha1_hex($ctx->{mid});
        $hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/i or
                        die "BUG: not a SHA-1 hex: $hex";
-       my $blob = `git cat-file blob HEAD:$1/$2 2>/dev/null`;
-       $? == 0 ? \$blob : undef;
+
+       my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
+                       qw(cat-file blob), "HEAD:$1/$2");
+       my $cmd = join(' ', @cmd);
+       my $pid = open my $fh, '-|';
+       defined $pid or die "fork failed: $!\n";
+       if ($pid == 0) {
+               open STDERR, '>', '/dev/null'; # ignore errors
+               exec @cmd or die "exec failed: $!\n";
+       } else {
+               my $blob = eval { local $/; <$fh> };
+               close $fh;
+               $? == 0 ? \$blob : undef;
+       }
 }
 
 # /$LISTNAME/m/$MESSAGE_ID.txt                    -> raw original
@@ -169,7 +184,7 @@ sub get_mid_html {
                                                uri_escape_utf8($ctx->{mid}));
        my $pfx = "../f/$mid_href.html";
        require Email::MIME;
-       [ 200, [ 'Content-Type' => 'text/html' ],
+       [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
                [ PublicInbox::View->as_html(Email::MIME->new($$x), $pfx) ] ];
 }