From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] git: fix non-empty SCRIPT_NAME handling for PSGI mounts
Date: Wed, 4 Jan 2023 10:34:03 +0000 [thread overview]
Message-ID: <20230104103405.2432349-2-e@80x24.org> (raw)
In-Reply-To: <20230104103405.2432349-1-e@80x24.org>
When using the `mount' directive in PSGI (Plack::App::URLMap),
SCRIPT_NAME still needs to use a trailing slash before it can
be joined with another URL.
---
lib/PublicInbox/Git.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index a1af776b..68f72052 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -461,10 +461,10 @@ sub local_nick ($) {
sub host_prefix_url ($$) {
my ($env, $url) = @_;
return $url if index($url, '//') >= 0;
- my $scheme = $env->{'psgi.url_scheme'};
my $host_port = $env->{HTTP_HOST} //
"$env->{SERVER_NAME}:$env->{SERVER_PORT}";
- "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/') . $url;
+ my $sn = $env->{SCRIPT_NAME} // '';
+ "$env->{'psgi.url_scheme'}://$host_port$sn/$url";
}
sub base_url { # for coderepos, PSGI-only
next prev parent reply other threads:[~2023-01-04 10:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 10:34 [PATCH 0/3] www: cleanup URL generation around coderepos Eric Wong
2023-01-04 10:34 ` Eric Wong [this message]
2023-01-04 10:34 ` [PATCH 2/3] git: pub_urls shows base_url default Eric Wong
2023-01-05 9:58 ` Eric Wong
2023-01-04 10:34 ` [PATCH 3/3] www: make coderepo URL generation more consistent 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=20230104103405.2432349-2-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).