From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id B90EB1FD56 for ; Sat, 11 Jan 2020 22:35:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 5/9] cgit: drop cgit_parse_hdr wrapper Date: Sat, 11 Jan 2020 22:34:59 +0000 Message-Id: <20200111223503.24473-6-e@yhbt.net> In-Reply-To: <20200111223503.24473-1-e@yhbt.net> References: <20200111223503.24473-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Unlike PublicInbox::GitHTTPBackend::git_parse_hdr, cgit_parse_hdr does nothing interesting besides calling parse_cgi_headers. So just make a reference to PublicInbox::GitHTTPBackend::parse_cgi_headers and call it. --- lib/PublicInbox/Cgit.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm index c42f8847..d9b7831f 100644 --- a/lib/PublicInbox/Cgit.pm +++ b/lib/PublicInbox/Cgit.pm @@ -11,7 +11,6 @@ use PublicInbox::GitHTTPBackend; use PublicInbox::Git; # not bothering with Exporter for a one-off *input_prepare = *PublicInbox::GitHTTPBackend::input_prepare; -*parse_cgi_headers = *PublicInbox::GitHTTPBackend::parse_cgi_headers; *serve = *PublicInbox::GitHTTPBackend::serve; use warnings; use PublicInbox::Qspawn; @@ -94,11 +93,7 @@ my @PASS_ENV = qw( ); # XXX: cgit filters may care about more variables... -sub cgit_parse_hdr { # {parse_hdr} for Qspawn - my ($r, $bref) = @_; - my $res = parse_cgi_headers($r, $bref) or return; # incomplete - $res; -} +my $parse_cgi_headers = \&PublicInbox::GitHTTPBackend::parse_cgi_headers; sub call { my ($self, $env) = @_; @@ -127,7 +122,7 @@ sub call { my $rdr = input_prepare($env) or return r(500); my $qsp = PublicInbox::Qspawn->new($self->{cmd}, $cgi_env, $rdr); my $limiter = $self->{pi_config}->limiter('-cgit'); - $qsp->psgi_return($env, $limiter, \&cgit_parse_hdr); + $qsp->psgi_return($env, $limiter, $parse_cgi_headers); } 1;