Content type for all RSS feeds set to application/rss+xml.

Bumped version for release.

diff --git a/debian/changelog b/debian/changelog
index 8301a92..8745cfa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cocanwiki (1.3.6-1) unstable; urgency=low
+cocanwiki (1.3.6-2) unstable; urgency=low
 
   * Initial Release.
 

diff --git a/scripts/history_rss.ml b/scripts/history_rss.ml
index 11590e9..0aa9575 100644 (file)
--- a/scripts/history_rss.ml
+++ b/scripts/history_rss.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: history_rss.ml,v 1.1 2004/11/01 17:46:21 rich Exp $
+ * $Id: history_rss.ml,v 1.2 2004/11/02 11:05:58 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,7 +97,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
 
   template#table "history" table;
 
-  q#template template
+  q#template ~content_type:"application/rss+xml" template
 
 let () =
   register_script ~restrict:[CanEdit] run

diff --git a/scripts/page_rss.ml b/scripts/page_rss.ml
index b9e1df0..cd799c4 100644 (file)
--- a/scripts/page_rss.ml
+++ b/scripts/page_rss.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: page_rss.ml,v 1.1 2004/11/01 17:46:21 rich Exp $
+ * $Id: page_rss.ml,v 1.2 2004/11/02 11:05:59 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ open Cocanwiki
 open Cocanwiki_template
 
 let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
-  let template = get_template dbh hostid "rss.xml" in
+  let template = get_template dbh hostid "page_rss.xml" in
 
   let page = q#param "page" in
   let page = if page = "" then "index" else page in
@@ -83,7 +83,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
 
   template#table "sections" sections;
 
-  q#template ~content_type:"text/xml" template
+  q#template ~content_type:"application/rss+xml" template
 
 let () =
   register_script ~restrict:[CanView] run

diff --git a/scripts/recent_rss.ml b/scripts/recent_rss.ml
index 08fde14..c376dc4 100644 (file)
--- a/scripts/recent_rss.ml
+++ b/scripts/recent_rss.ml
@@ -1,7 +1,7 @@
 (* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: recent_rss.ml,v 1.1 2004/11/01 17:46:21 rich Exp $
+ * $Id: recent_rss.ml,v 1.2 2004/11/02 11:05:59 rich Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,7 +97,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} _ =
 
   template#table "recent_changes" table;
 
-  q#template template
+  q#template ~content_type:"application/rss+xml" template
 
 let () =
   register_script ~restrict:[CanEdit] run