* [PATCH 4/6] www: use PSGI env directly
2016-07-02 7:56 6% [PATCH 0/6] misc cleanups Eric Wong
@ 2016-07-02 7:56 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-07-02 7:56 UTC (permalink / raw)
To: meta
More work on on the Plack::Request/CGI.pm removal front,
No need to access the PSGI env through an extra hash lookup.
---
lib/PublicInbox/SearchView.pm | 2 +-
lib/PublicInbox/WWW.pm | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index ce1eff1..15bb823 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -86,7 +86,7 @@ sub mset_summary {
sub err_txt {
my ($ctx, $err) = @_;
my $u = '//xapian.org/docs/queryparser.html';
- $u = PublicInbox::Hval::prurl($ctx->{cgi}->{env}, $u);
+ $u = PublicInbox::Hval::prurl($ctx->{env}, $u);
$err =~ s/^\s*Exception:\s*//; # bad word to show users :P
$err = ascii_html($err);
"\nBad query: <b>$err</b>\n" .
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 1e23c43..940e1c5 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -152,7 +152,7 @@ sub invalid_inbox {
$ctx->{git_dir} = $obj->{mainrepo};
$ctx->{git} = $obj->git;
# for PublicInbox::HTTP::weaken_task:
- $ctx->{cgi}->{env}->{'pi-httpd.inbox'} = $obj;
+ $ctx->{env}->{'pi-httpd.inbox'} = $obj;
$ctx->{-inbox} = $obj;
$ctx->{inbox} = $inbox;
return;
@@ -162,7 +162,7 @@ sub invalid_inbox {
# generation and link things intended for nntp:// to https?://,
# so try to infer links and redirect them to the appropriate
# list URL.
- $self->news_www->call($ctx->{cgi}->{env});
+ $self->news_www->call($ctx->{env});
}
# returns undef if valid, array ref response if invalid
@@ -284,7 +284,7 @@ sub footer {
$ctx->{footer} = join("\n",
'- ' . $desc,
"A <a\nhref=\"" .
- PublicInbox::Hval::prurl($ctx->{cgi}->{env}, PI_URL) .
+ PublicInbox::Hval::prurl($ctx->{env}, PI_URL) .
'">public-inbox</a>, ' .
'anybody may post in plain-text (not HTML):',
$addr,
@@ -388,13 +388,12 @@ sub legacy_redirects {
} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
r301($ctx, $1, $2);
} else {
- $self->news_www->call($ctx->{cgi}->{env});
+ $self->news_www->call($ctx->{env});
}
}
sub r301 {
my ($ctx, $inbox, $mid, $suffix) = @_;
- my $cgi = $ctx->{cgi};
my $obj = $ctx->{-inbox};
unless ($obj) {
my $r404 = invalid_inbox($ctx->{www}, $ctx, $inbox);
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/6] misc cleanups
@ 2016-07-02 7:56 6% Eric Wong
2016-07-02 7:56 7% ` [PATCH 4/6] www: use PSGI env directly Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-07-02 7:56 UTC (permalink / raw)
To: meta
Should be pretty obvious, and the iffstat looks good :)
Eric Wong (6):
TODO: clarify streaming Email::MIME replacement
inbox: base_url method takes PSGI env hashref instead
extmsg: rework to use Inbox objects
www: use PSGI env directly
view: rely on internal query parser for 'o' param
www: remove Plack::Request dependency entirely
TODO | 1 +
lib/PublicInbox/ExtMsg.pm | 102 ++++++++++++++++++------------------------
lib/PublicInbox/Feed.pm | 13 +++---
lib/PublicInbox/Inbox.pm | 17 +++++--
lib/PublicInbox/Mbox.pm | 2 +-
lib/PublicInbox/SearchView.pm | 2 +-
lib/PublicInbox/View.pm | 2 +-
lib/PublicInbox/WWW.pm | 24 +++++-----
lib/PublicInbox/WwwStream.pm | 9 +---
script/public-inbox-httpd | 1 -
t/httpd-corner.t | 2 +-
t/httpd-unix.t | 2 +-
t/httpd.t | 2 +-
t/plack.t | 2 +-
t/psgi_attach.t | 2 +-
t/psgi_mount.t | 2 +-
t/view.t | 1 +
17 files changed, 86 insertions(+), 100 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-07-02 7:56 6% [PATCH 0/6] misc cleanups Eric Wong
2016-07-02 7:56 7% ` [PATCH 4/6] www: use PSGI env directly 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).