user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@yhbt.net>
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> (raw)
In-Reply-To: <20200111223503.24473-1-e@yhbt.net>

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;

  parent reply index

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-11 22:34 [PATCH 0/9] more small fixes and cleanups Eric Wong
2020-01-11 22:34 ` [PATCH 1/9] config: do not slurp entire cgitrc at once Eric Wong
2020-01-11 22:34 ` [PATCH 2/9] git: modified: don't slurp `rev-parse --branches' Eric Wong
2020-01-11 22:34 ` [PATCH 3/9] git: packed_bytes: use GLOB_NOSORT Eric Wong
2020-01-11 22:34 ` [PATCH 4/9] solver: path_a may be undef from /dev/null Eric Wong
2020-01-11 22:34 ` Eric Wong [this message]
2020-01-11 22:35 ` [PATCH 6/9] xapcmd: use popen_rd for running xapian-compact Eric Wong
2020-01-11 22:35 ` [PATCH 7/9] xt/git_async_cmp: do not slurp large OID list into memory Eric Wong
2020-01-11 22:35 ` [PATCH 8/9] t/solver_git: avoid uninitialized warnings in hostname generation Eric Wong
2020-01-11 22:35 ` [PATCH 9/9] use popen_rd for bidirectional pipes Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200111223503.24473-6-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git