From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] githttpbackend: simplify compatibility code
Date: Sun, 25 Dec 2016 10:36:51 +0000 [thread overview]
Message-ID: <20161225103653.8325-3-e@80x24.org> (raw)
In-Reply-To: <20161225103653.8325-1-e@80x24.org>
Fewer conditionals means theres fewer code paths to test
and makes things easier-to-read.
---
examples/public-inbox.psgi | 1 +
lib/PublicInbox/GitHTTPBackend.pm | 15 ++++++---------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index e97f917..98cde92 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -14,6 +14,7 @@ my $www = PublicInbox::WWW->new;
# share the public-inbox code itself:
my $src = $ENV{SRC_GIT_DIR}; # '/path/to/public-inbox.git'
+$src = PublicInbox::Git->new($src) if defined $src;
builder {
eval {
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 86b8ebc..4ad3fd1 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -46,6 +46,9 @@ sub r ($;$) {
sub serve {
my ($env, $git, $path) = @_;
+ # XXX compatibility... ugh, can we stop supporting this?
+ $git = PublicInbox::Git->new($git) unless ref($git);
+
# Documentation/technical/http-protocol.txt in git.git
# requires one and exactly one query parameter:
if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ ||
@@ -98,7 +101,7 @@ sub serve_dumb {
return r(404);
}
- my $f = (ref $git ? $git->{git_dir} : $git) . '/' . $path;
+ my $f = $git->{git_dir} . '/' . $path;
return r(404) unless -f $f && -r _; # just in case it's a FIFO :P
my $size = -s _;
@@ -196,14 +199,8 @@ sub serve_smart {
my $val = $env->{$name};
$env{$name} = $val if defined $val;
}
- my ($git_dir, $limiter);
- if (ref $git) {
- $limiter = $git->{-httpbackend_limiter} || $default_limiter;
- $git_dir = $git->{git_dir};
- } else {
- $limiter = $default_limiter;
- $git_dir = $git;
- }
+ my $limiter = $git->{-httpbackend_limiter} || $default_limiter;
+ my $git_dir = $git->{git_dir};
$env{GIT_HTTP_EXPORT_ALL} = '1';
$env{PATH_TRANSLATED} = "$git_dir/$path";
my $rdr = { 0 => fileno($in) };
--
EW
next prev parent reply other threads:[~2016-12-25 10:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-25 10:36 [PATCH 0/4] various cleanups around http Eric Wong
2016-12-25 10:36 ` [PATCH 1/4] githttpbackend: minor readability improvement Eric Wong
2016-12-25 10:36 ` Eric Wong [this message]
2016-12-25 10:36 ` [PATCH 3/4] githttpbackend: minor cleanups to improve readability Eric Wong
2016-12-25 10:36 ` [PATCH 4/4] httpd/async: improve variable naming 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=20161225103653.8325-3-e@80x24.org \
--to=e@80x24.org \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).