www: fix redirection loops

[public-inbox.git] / lib / PublicInbox / WWW.pm

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index ee414e85d1d5a9442d6a34281df43834e0753cea..d5635d849fcea047c0402f22cacbdab87ce913ea 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -47,7 +47,9 @@ sub run {
 
        # in case people leave off the trailing slash:
        } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t)\z!o) {
-               r301($ctx, $1, $2, $3 eq 't' ? 't/#u' : $3);
+               my ($listname, $mid, $suffix) = ($1, $2, $3);
+               $suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
+               r301($ctx, $listname, $mid, $suffix);
 
        # convenience redirects order matters
        } elsif ($path_info =~ m!$LISTNAME_RE/([^/]{2,})\z!o) {
@@ -198,6 +200,7 @@ sub get_thread {
 
 sub self_url {
        my ($cgi) = @_;
+                                               # Plack::Request
        ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
 }
 
@@ -358,15 +361,19 @@ sub r301 {
        my ($ctx, $listname, $mid, $suffix) = @_;
        my $cgi = $ctx->{cgi};
        my $url;
+       my $qs;
        if (ref($cgi) eq 'CGI') {
                $url = $cgi->url(-base) . '/';
-       } else {
+               $qs = $cgi->query_string;
+       } else { # Plack::Request
                $url = $cgi->base->as_string;
+               $qs = $cgi->env->{QUERY_STRING};
        }
 
        $url .= $listname . '/';
        $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
+       $url .= "?$qs" if $qs ne '';
 
        [ 301,
          [ Location => $url, 'Content-Type' => 'text/plain' ],