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,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 2F83D211B5 for ; Thu, 31 Jan 2019 10:51:54 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/6] inbox: drop psgi.url_scheme requirement from base_url Date: Thu, 31 Jan 2019 10:51:48 +0000 Message-Id: <20190131105153.25272-2-e@80x24.org> In-Reply-To: <20190131105153.25272-1-e@80x24.org> References: <20190131105153.25272-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This will make it easier to make command-line tools from SolverGit. --- lib/PublicInbox/Inbox.pm | 4 ++-- t/solver_git.t | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 6fe896f..cde4625 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -202,8 +202,8 @@ sub cloneurl { sub base_url { my ($self, $env) = @_; - if ($env) { # PSGI env - my $scheme = $env->{'psgi.url_scheme'}; + 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} || '/'); diff --git a/t/solver_git.t b/t/solver_git.t index 66e6317..8de6398 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -44,7 +44,7 @@ $ibx->{-repo_objs} = [ PublicInbox::Git->new($git_dir) ]; my $res; my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); open my $log, '+>>', "$mainrepo/solve.log" or die "open: $!"; -my $psgi_env = { 'psgi.url_scheme' => 'http', HTTP_HOST => 'example.com' }; +my $psgi_env = { 'psgi.errors' => *STDERR }; $solver->solve($psgi_env, $log, '69df7d5', {}); ok($res, 'solved a blob!'); my $wt_git = $res->[0]; -- EW