examples/public-inbox.psgi: update with middlewares

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

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 5c6dfe8a3c5a298ba3b7f4591c4dce0223b041b8..b095621da3c9c1f7d583959a05f049341b3c6b22 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -4,17 +4,22 @@
 use strict;
 use warnings;
 use IO::Handle;
-require PublicInbox::WWW;
+use PublicInbox::WWW;
 use CGI qw/-nosticky/;
 our $NO_SCRIPT_NAME;
 our %HTTP_CODES;
 BEGIN {
        $NO_SCRIPT_NAME = 1 if $ENV{NO_SCRIPT_NAME};
-       CGI->compile if $ENV{MOD_PERL};
+       if ($ENV{MOD_PERL}) {
+               CGI->compile;
+               PublicInbox::WWW->preload;
+       }
 
        %HTTP_CODES = (
                200 => 'OK',
+               300 => 'Multiple Choices',
                301 => 'Moved Permanently',
+               302 => 'Found',
                404 => 'Not Found',
                405 => 'Method Not Allowed',
                501 => 'Not Implemented',
@@ -32,16 +37,13 @@ my $ret = PublicInbox::WWW::run($req, $req->request_method);
 
 my $out = select;
 $out->binmode;
-if (@ARGV && $ARGV[0] eq 'static') {
-       $out->write($ret->[2]->[0]); # only show the body
-} else { # CGI
-       if (ref($ret) eq 'CODE') {
-               $ret->(*dump_header);
-       } else {
-               my ($status, $headers, $body) = @$ret;
 
-               dump_header([$status, $headers])->write($body->[0]);
-       }
+if (ref($ret) eq 'CODE') {
+       $ret->(*dump_header);
+} else {
+       my ($status, $headers, $body) = @$ret;
+
+       dump_header([$status, $headers])->write($body->[0]);
 }
 
 sub dump_header {