Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 8adfd5dd99668c526168b09ba4f0fc334873d578..42cfa9e8aad04fc69b050df92b38a18905a33495 100644 (file)
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "cgi", id => '404',  call => \&cgi);
+       hook(type => "getsetup", id => '404',  call => \&getsetup);
        IkiWiki::loadplugin("goto");
 }
 

diff --git a/debian/changelog b/debian/changelog
index bdf6a6a8ed9e65144aa5656cbc8b3e4771b62038..bb9a43692d459dac45b98fe8bfa2a207c6319399 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
     avoid unnecessary calls to filter hook.
   * po: needstranslation() pagespec can have a percent specified.
+  * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have
+    the caching problem that was added to work around). Closes: #588623
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 

diff --git a/templates/page.tmpl b/templates/page.tmpl
index da8c2940f8cc74b98498ed6759e54ddfe5b1b5cb..703a6d8de0db416416dc5f8fc171972c6edbda77 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -11,7 +11,6 @@
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-<meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />