* [PATCH 8/9] t/solver_git: avoid uninitialized warnings in hostname generation
@ 2020-01-11 22:35 4% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-01-11 22:35 UTC (permalink / raw)
To: meta
Outside of tests, this is only relevant for non-PSGI use, which
may happen someday...
Fixes: cb1c874520153f5c ("inbox: use PublicInbox::Git::host_prefix_url for base_url")
---
t/solver_git.t | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/solver_git.t b/t/solver_git.t
index 77fa1e09..98317fae 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -42,7 +42,8 @@ $ibx->{-repo_objs} = [ $git ];
my $res;
my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
-my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http' };
+my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http',
+ 'HTTP_HOST' => 'example.com' };
$solver->solve($psgi_env, $log, '69df7d5', {});
ok($res, 'solved a blob!');
my $wt_git = $res->[0];
^ permalink raw reply related [relevance 4%]
* [PATCH 1/5] inbox: use PublicInbox::Git::host_prefix_url for base_url
2020-01-10 9:14 5% [PATCH 0/5] misc cleanups and bugfixes Eric Wong
@ 2020-01-10 9:14 7% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-01-10 9:14 UTC (permalink / raw)
To: meta
Better not to duplicate the same logic across different classes.
Also, our git wrapper class is a strange place for
host_prefix_url, but it needs to be usable for coderepos, so
it's there, for now...
---
lib/PublicInbox/Inbox.pm | 30 +++++++++++++-----------------
t/solver_git.t | 2 +-
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index a3cdcbc0..ff800965 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -240,26 +240,22 @@ sub cloneurl {
}
sub base_url {
- my ($self, $env) = @_;
- my $scheme;
- if ($env && ($scheme = $env->{'psgi.url_scheme'})) { # PSGI env
- my $host_port = $env->{HTTP_HOST} ||
- "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
- my $url = "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/');
+ my ($self, $env) = @_; # env - PSGI env
+ if ($env) {
+ my $url = PublicInbox::Git::host_prefix_url($env, '');
# for mount in Plack::Builder
$url .= '/' if $url !~ m!/\z!;
- $url .= $self->{name} . '/';
- } else {
- # either called from a non-PSGI environment (e.g. NNTP/POP3)
- $self->{-base_url} ||= do {
- my $url = $self->{url}->[0] or return undef;
- # expand protocol-relative URLs to HTTPS if we're
- # not inside a web server
- $url = "https:$url" if $url =~ m!\A//!;
- $url .= '/' if $url !~ m!/\z!;
- $url;
- };
+ return $url .= $self->{name} . '/';
}
+ # called from a non-PSGI environment (e.g. NNTP/POP3):
+ $self->{-base_url} ||= do {
+ my $url = $self->{url}->[0] or return undef;
+ # expand protocol-relative URLs to HTTPS if we're
+ # not inside a web server
+ $url = "https:$url" if $url =~ m!\A//!;
+ $url .= '/' if $url !~ m!/\z!;
+ $url;
+ };
}
sub nntp_url {
diff --git a/t/solver_git.t b/t/solver_git.t
index 55746994..7c5619a7 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -48,7 +48,7 @@ $ibx->{-repo_objs} = [ $git ];
my $res;
my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
-my $psgi_env = { 'psgi.errors' => *STDERR };
+my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http' };
$solver->solve($psgi_env, $log, '69df7d5', {});
ok($res, 'solved a blob!');
my $wt_git = $res->[0];
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] misc cleanups and bugfixes
@ 2020-01-10 9:14 5% Eric Wong
2020-01-10 9:14 7% ` [PATCH 1/5] inbox: use PublicInbox::Git::host_prefix_url for base_url Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-01-10 9:14 UTC (permalink / raw)
To: meta
Some minor things, probably unlikely to matter a lot
but we can trim some code a little.
Eric Wong (5):
inbox: use PublicInbox::Git::host_prefix_url for base_url
allow HTTP_HOST to be '0' via defined() checks
git: ->modified uses cat_async
git: remove ->commit_title method
spawn (and thus popen_rd) die on failure
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/Git.pm | 24 +++++++++++-------------
lib/PublicInbox/HTTP.pm | 2 +-
lib/PublicInbox/Import.pm | 2 --
lib/PublicInbox/Inbox.pm | 30 +++++++++++++-----------------
lib/PublicInbox/SearchIdx.pm | 1 -
lib/PublicInbox/Spamcheck/Spamc.pm | 1 -
lib/PublicInbox/Spawn.pm | 1 -
lib/PublicInbox/TestCommon.pm | 1 -
lib/PublicInbox/V2Writable.pm | 1 -
lib/PublicInbox/WatchMaildir.pm | 1 -
lib/PublicInbox/WwwListing.pm | 4 +---
t/check-www-inbox.perl | 1 -
t/solver_git.t | 8 +-------
14 files changed, 28 insertions(+), 51 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-10 9:14 5% [PATCH 0/5] misc cleanups and bugfixes Eric Wong
2020-01-10 9:14 7% ` [PATCH 1/5] inbox: use PublicInbox::Git::host_prefix_url for base_url Eric Wong
2020-01-11 22:34 [PATCH 0/9] more small fixes and cleanups Eric Wong
2020-01-11 22:35 4% ` [PATCH 8/9] t/solver_git: avoid uninitialized warnings in hostname generation Eric Wong
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).