summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-02-27 23:38:58 +0100
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-02-27 23:38:58 +0100
commitb8b25a522ff1a05c9b8d64b2e875eb8a04967b40 (patch)
tree7e64a86f20f9d25bfda34cb62a4eecae45d47ce4 /src
parent453f7bfec6cba157c81ac1c170cd92aee38e4762 (diff)
Book Marx: Serve Atom feed UTF-8-encoded.
Diffstat (limited to 'src')
-rw-r--r--src/mulk/benki/book_marx.clj2
-rw-r--r--src/mulk/benki/main.clj2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mulk/benki/book_marx.clj b/src/mulk/benki/book_marx.clj
index 0c02a02..9eabfc1 100644
--- a/src/mulk/benki/book_marx.clj
+++ b/src/mulk/benki/book_marx.clj
@@ -122,7 +122,7 @@
(defpage "/marx/feed" {}
(let [user (session/get :user)]
- (response/content-type "application/atom+xml"
+ (response/content-type "application/atom+xml; charset=UTF-8"
(marx-feed-for-user user))))
(defpage "/marx/tags" {}
diff --git a/src/mulk/benki/main.clj b/src/mulk/benki/main.clj
index 5367068..169b60b 100644
--- a/src/mulk/benki/main.clj
+++ b/src/mulk/benki/main.clj
@@ -16,7 +16,7 @@
ctype (get-in response [:headers "Content-Type"])
utf8ctype (str ctype "; charset=utf-8")]
(if (and ctype
- (re-matches #"^(text/html|text/plain|application/xhtml+xml|text/xml)$" ctype))
+ (re-matches #"^(text/html|text/plain|application/xhtml+xml|text/xml|application/atom+xml)$" ctype))
(assoc-in response [:headers "Content-Type"] utf8ctype)
response))))