treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / WwwHighlight.pm

diff --git a/lib/PublicInbox/WwwHighlight.pm b/lib/PublicInbox/WwwHighlight.pm
index d8101b7555b8c832de1dddccea843f2346e3290b..170bfcaa470165c93709e53f0d120b5e9f55e4bc 100644 (file)
--- a/lib/PublicInbox/WwwHighlight.pm
+++ b/lib/PublicInbox/WwwHighlight.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Standalone PSGI app to provide syntax highlighting as-a-service
@@ -22,21 +22,15 @@ package PublicInbox::WwwHighlight;
 use strict;
 use warnings;
 use bytes (); # only for bytes::length
-use HTTP::Status qw(status_message);
 use parent qw(PublicInbox::HlMod);
 use PublicInbox::Linkify qw();
+use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::WwwStatic qw(r);
 
 # TODO: support highlight(1) for distros which don't package the
 # SWIG extension.  Also, there may be admins who don't want to
 # have ugly SWIG-generated code in a long-lived Perl process.
 
-sub r ($) {
-       my ($code) = @_;
-       my $msg = status_message($code);
-       my $len = length($msg);
-       [ $code, [qw(Content-Type text/plain Content-Length), $len], [$msg] ]
-}
-
 # another slurp API hogging up all my memory :<
 # This is capped by whatever the PSGI server allows,
 # $ENV{GIT_HTTP_MAX_REQUEST_BUFFER} for PublicInbox::HTTP (10 MB)
@@ -67,7 +61,11 @@ sub call {
        my $bref = read_in_full($env) or return r(500);
        my $l = PublicInbox::Linkify->new;
        $l->linkify_1($$bref);
-       $bref = $self->do_hl($bref, $env->{PATH_INFO});
+       if (my $res = $self->do_hl($bref, $env->{PATH_INFO})) {
+               $bref = $res;
+       } else {
+               $$bref = ascii_html($$bref);
+       }
        $l->linkify_2($$bref);
 
        my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];