Send cache-control headers with feeds, this makes 304 responses possible

diff --git a/includes/Feed.php b/includes/Feed.php
index e7539fc..590d9ca 100644 (file)
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -88,9 +88,13 @@ class RSSFeed extends ChannelFeed {
        }
        
        function outHeader() {
-               global $wgVersion;
+               global $wgVersion, $wgOut;
                
+               # We take over from $wgOut, excepting its cache header info
+               $wgOut->disable();
                header( "Content-type: application/xml; charset=UTF-8" );
+               $wgOut->sendCacheControl();
+               
                print '<' . '?xml version="1.0" encoding="utf-8"?' . ">\n";
                ?><rss version="2.0">
        <channel>

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 93a13bf..6ba0339 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -94,8 +94,6 @@ class QueryPage {
                global $wgFeedClasses;
                global $wgOut, $wgLanguageCode, $wgLang;
                if( $class == "rss" ) {
-                       $wgOut->disable();
-                       
                        $feed = new RSSFeed(
                                $this->feedTitle(),
                                $this->feedDesc(),

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 46a5707..68e0db6 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -126,8 +126,6 @@ function wfSpecialRecentchanges( $par )
        $wgOut->addHTML( "{$note}\n" );
 
        if( $feeding ) {
-               $wgOut->disable();
-               
                $feed = new RSSFeed(
                        $wgSitename . " - " . wfMsg( "recentchanges" ) . " [" . $wgLanguageCode . "]",
                        htmlspecialchars( wfMsg( "recentchangestext" ) ),