From 46b880f8390ac82d746add01de38a05155743374 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 31 Jan 2009 22:32:10 +0000
Subject: Split apache404 into an independent plugin

Also make it ignore the 'do' parameter at Joey's suggestion, to have one
less thing to remember when configuring.
---
 IkiWiki/CGI.pm | 49 +------------------------------------------------
 1 file changed, 1 insertion(+), 48 deletions(-)

(limited to 'IkiWiki/CGI.pm')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 8734cdd49..e75ebcd27 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -338,46 +338,6 @@ sub cgi_goto ($;$) {
 	exit;
 }
 
-sub cgi_page_from_404 ($$$) {
-	my $path = shift;
-	my $baseurl = shift;
-	my $usedirs = shift;
-
-	# fail if missing from environment or whatever
-	return undef unless defined $path;
-	return undef unless defined $baseurl;
-
-	# with usedirs on, path is like /~fred/foo/bar/ or /~fred/foo/bar or
-	#    /~fred/foo/bar/index.html
-	# with usedirs off, path is like /~fred/foo/bar.html
-	# baseurl is like 'http://people.example.com/~fred'
-
-	# convert baseurl to ~fred
-	unless ($baseurl =~ s{^https?://[^/]+/?}{}) {
-		return undef;
-	}
-
-	# convert path to /~fred/foo/bar
-	if ($usedirs) {
-		$path =~ s/\/*(?:index\.$config{htmlext})?$//;
-	}
-	else {
-		$path =~ s/\.$config{htmlext}$//;
-	}
-
-	# remove /~fred/
-	unless ($path =~ s{^/*\Q$baseurl\E/*}{}) {
-		return undef;
-	}
-
-	# special case for the index
-	unless ($path) {
-		return 'index';
-	}
-
-	return $path;
-}
-
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
@@ -409,14 +369,7 @@ sub cgi (;$$) {
 	# commenter are for compatibility with any saved URLs
 	if ($do eq 'goto' || $do eq 'recentchanges_link' ||
 	    $do eq 'commenter') {
-		my $page = undef;
-
-		if ($ENV{REDIRECT_STATUS} eq '404') {
-			$page = cgi_page_from_404($ENV{REDIRECT_URL},
-				$config{url}, $config{usedirs});
-		}
-
-		cgi_goto($q, $page);
+		cgi_goto($q);
 	}
 
 	# Need to lock the wiki before getting a session.
-- 
cgit v1.2.3