CGI: pad error responses with 512 bytes of spaces so IE will display them

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 82cad40c80ad92961fb88e1717f9d0f06049af9e..8734cdd494ece0d4f1a2229d0bed37542519495e 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -239,6 +239,9 @@ sub check_banned ($$) {
                        print $q->header(-status => "403 Forbidden");
                        $session->delete();
                        print gettext("You are banned.");
+                       # Internet Explorer won't show custom 404 responses
+                       # unless they're >= 512 bytes
+                       print " " x 512;
                        cgi_savesession($session);
                        exit;
                }
@@ -323,7 +326,10 @@ sub cgi_goto ($;$) {
                        "<p>".
                        sprintf(gettext("The page %s does not exist."),
                                htmllink("", "", $page)).
-                       "</p>");
+                       "</p>".
+                       # Internet Explorer won't show custom 404 responses
+                       # unless they're >= 512 bytes
+                       (" " x 512));
        }
        else {
                redirect($q, urlto($link, undef, 1));
@@ -403,7 +409,14 @@ sub cgi (;$$) {
        # commenter are for compatibility with any saved URLs
        if ($do eq 'goto' || $do eq 'recentchanges_link' ||
            $do eq 'commenter') {
-               cgi_goto($q);
+               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);
        }
 
        # Need to lock the wiki before getting a session.