cgi: disable warnings for CGI::NOSTICKY

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

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 26b0fc618798d3e86f2038811bf6a727b20f7063..b63223f509fc24cb05905e05c163c621303b7077 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -12,17 +12,17 @@
 use 5.008;
 use strict;
 use warnings;
-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);
-our $enc_utf8 = find_encoding('UTF-8');
+use URI::Escape qw(uri_escape_utf8 uri_unescape);
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $pi_config;
 BEGIN {
        $pi_config = PublicInbox::Config->new;
        # TODO: detect and reload config as needed
        if ($ENV{MOD_PERL}) {
+               require CGI;
+               no warnings;
+               $CGI::NOSTICKY = 1;
                CGI->compile;
        }
 }
@@ -30,7 +30,14 @@ BEGIN {
 if ($ENV{PI_PLACKUP}) {
        psgi_app();
 } else {
-       my $ret = main();
+       # some servers (Ruby webrick) include scheme://host[:port] here,
+       # which confuses CGI.pm when generating self_url.
+       # RFC 3875 does not mention REQUEST_URI at all,
+       # so nuke it since CGI.pm functions without it.
+       require CGI;
+       delete $ENV{REQUEST_URI};
+       my $req = CGI->new;
+       my $ret = main($req, $req->request_method);
        binmode STDOUT;
        if (@ARGV && $ARGV[0] eq 'static') {
                print $ret->[2]->[0];
@@ -42,21 +49,15 @@ if ($ENV{PI_PLACKUP}) {
 # private functions below
 
 sub main {
-       # some servers (Ruby webrick) include scheme://host[:port] here,
-       # which confuses CGI.pm when generating self_url.
-       # RFC 3875 does not mention REQUEST_URI at all,
-       # so nuke it since CGI.pm functions without it.
-       delete $ENV{REQUEST_URI};
-
-       my $cgi = CGI->new;
+       my ($cgi, $method) = @_;
        my %ctx;
-       if ($cgi->request_method !~ /\AGET|HEAD\z/) {
+       if ($method !~ /\AGET|HEAD\z/) {
                return r(405, 'Method Not Allowed');
        }
-       my $path_info = $enc_utf8->decode($cgi->path_info);
+       my $path_info = $cgi->path_info;
 
        # top-level indices and feeds
-       if ($path_info eq "/") {
+       if ($path_info eq '/') {
                r404();
        } elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
                invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
@@ -142,12 +143,16 @@ 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`;
+       require IPC::Run;
+       my ($in, $blob, $err);
+       open my $null, '+<', '/dev/null' or die "open: $!\n";
+       IPC::Run::run(['git', "--git-dir=$ctx->{git_dir}",
+                       qw(cat-file blob), "HEAD:$1/$2"],
+                       $null, \$blob, $null);
        $? == 0 ? \$blob : undef;
 }
 
@@ -165,7 +170,8 @@ sub get_mid_html {
        return r404() unless $x;
 
        require PublicInbox::View;
-       my $mid_href = PublicInbox::Hval::ascii_html(uri_escape($ctx->{mid}));
+       my $mid_href = PublicInbox::Hval::ascii_html(
+                                               uri_escape_utf8($ctx->{mid}));
        my $pfx = "../f/$mid_href.html";
        require Email::MIME;
        [ 200, [ 'Content-Type' => 'text/html' ],
@@ -183,14 +189,19 @@ sub get_full_html {
                [ PublicInbox::View->as_html(Email::MIME->new($$x))] ];
 }
 
+sub self_url {
+       my ($cgi) = @_;
+       ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
+}
+
 sub redirect_list_index {
        my ($ctx, $cgi) = @_;
-       do_redirect($cgi->self_url . "/");
+       do_redirect(self_url($cgi) . "/");
 }
 
 sub redirect_mid {
        my ($ctx, $cgi) = @_;
-       my $url = $cgi->self_url;
+       my $url = self_url($cgi);
        $url =~ s!/f/!/m/!;
        do_redirect($url . '.html');
 }
@@ -204,8 +215,6 @@ sub do_redirect {
 }
 
 sub psgi_app {
-       require CGI::Emulate::PSGI;
-
        # preload so we are CoW friendly
        require PublicInbox::Feed;
        require PublicInbox::View;
@@ -213,12 +222,11 @@ sub psgi_app {
        require Digest::SHA;
        require POSIX;
        require XML::Atom::SimpleFeed;
-       eval { require Git };
+       require Plack::Request;
        sub {
-               my ($e) = @_;
-               local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($e));
-               main();
-       }
+               my $req = Plack::Request->new(@_);
+               main($req, $req->method);
+       };
 }
 
 sub cgi_print {