X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWWW.pm;h=6e69001c4c4d78fa2e52fc851525c30bfd8f7a59;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=6e14e8c1d87ab9886c3d404e3ac310ab1f3317de;hpb=411dc580077c5240e9cfd4808c06623345435b69;p=public-inbox.git

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 6e14e8c1..6e69001c 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -175,14 +175,20 @@ sub r404 {
 # simple response for errors
 sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 
+sub news_cgit_fallback ($) {
+	my ($ctx) = @_;
+	my $www = $ctx->{www};
+	my $env = $ctx->{env};
+	my $res = $www->news_www->call($env);
+	$res->[0] == 404 ? $www->cgit->call($env) : $res;
+}
+
 # returns undef if valid, array ref response if invalid
 sub invalid_inbox ($$) {
 	my ($ctx, $inbox) = @_;
-	my $www = $ctx->{www};
-	my $obj = $www->{pi_config}->lookup_name($inbox);
-	if (defined $obj) {
-		$ctx->{git} = $obj->git;
-		$ctx->{-inbox} = $obj;
+	my $ibx = $ctx->{www}->{pi_config}->lookup_name($inbox);
+	if (defined $ibx) {
+		$ctx->{-inbox} = $ibx;
 		return;
 	}
 
@@ -190,9 +196,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.
-	my $env = $ctx->{env};
-	my $res = $www->news_www->call($env);
-	$res->[0] == 404 ? $www->cgit->call($env) : $res;
+	news_cgit_fallback($ctx);
 }
 
 # returns undef if valid, array ref response if invalid
@@ -392,19 +396,19 @@ sub legacy_redirects {
 	} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
 		r301($ctx, $1, $2);
 	} else {
-		$ctx->{www}->news_www->call($ctx->{env});
+		news_cgit_fallback($ctx);
 	}
 }
 
 sub r301 {
 	my ($ctx, $inbox, $mid_ue, $suffix) = @_;
-	my $obj = $ctx->{-inbox};
-	unless ($obj) {
+	my $ibx = $ctx->{-inbox};
+	unless ($ibx) {
 		my $r404 = invalid_inbox($ctx, $inbox);
 		return $r404 if $r404;
-		$obj = $ctx->{-inbox};
+		$ibx = $ctx->{-inbox};
 	}
-	my $url = $obj->base_url($ctx->{env});
+	my $url = $ibx->base_url($ctx->{env});
 	my $qs = $ctx->{env}->{QUERY_STRING};
 	if (defined $mid_ue) {
 		# common, and much nicer as '@' than '%40':