From fb72c5fb4353103b7928780f83d5e79b78038823 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 3 Jan 2016 23:49:49 +0000 Subject: www: comments for denoting Plack::Request vs CGI We'll probably want to continue supporting CGI for mod_perl compatibility. --- lib/PublicInbox/ExtMsg.pm | 2 +- lib/PublicInbox/Feed.pm | 2 +- lib/PublicInbox/WWW.pm | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm index 59bbae59..a56df335 100644 --- a/lib/PublicInbox/ExtMsg.pm +++ b/lib/PublicInbox/ExtMsg.pm @@ -89,7 +89,7 @@ sub ext_msg { again: my $cgi = $ctx->{cgi}; my $url = ref($cgi) eq 'CGI' ? $cgi->url(-base) . '/' - : $cgi->base->as_string; + : $cgi->base->as_string; # Plack::Request $url .= $listname; unshift @pfx, { git_dir => $ctx->{git_dir}, url => $url }; foreach my $pfx (@pfx) { diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 5708b60e..65514eb6 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -287,7 +287,7 @@ sub get_feedopts { my $base; if (ref($cgi) eq 'CGI') { $base = $cgi->url(-base); - } else { + } else { # Plack::Request $base = $cgi->base->as_string; $base =~ s!/\z!!; } diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index b4c050b1..411db16f 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -198,6 +198,7 @@ sub get_thread { sub self_url { my ($cgi) = @_; + # Plack::Request ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string; } @@ -362,7 +363,7 @@ sub r301 { if (ref($cgi) eq 'CGI') { $url = $cgi->url(-base) . '/'; $qs = $cgi->query_string; - } else { + } else { # Plack::Request $url = $cgi->base->as_string; $qs = $cgi->env->{QUERY_STRING}; } -- cgit v1.2.3-24-ge0c7