From f4e9cc1de964f0b249685b5fc0ebf7595233900e Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Tue, 15 Sep 2009 10:39:09 +0000
Subject: report charset in HTTP replies (suggested by Rolf Ahrenberg)

---
 server/menuHTTP.h | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/menuHTTP.h b/server/menuHTTP.h
index 8be613b..efa20f2 100644
--- a/server/menuHTTP.h
+++ b/server/menuHTTP.h
@@ -113,7 +113,12 @@ class cHtmlChannelList: public cChannelList
 		std::string ItemText();
 		std::string PageBottom();
 	public:
-		virtual std::string HttpHeader() { return cChannelList::HttpHeader() + "Content-type: text/html\r\n\r\n"; }
+		virtual std::string HttpHeader() {
+			return cChannelList::HttpHeader()
+				+ "Content-type: text/html; charset="
+				+ I18nCharSets()[Setup.OSDLanguage]
+				+ "\r\n";
+		}
 		virtual bool HasNext();
 		virtual std::string Next();
 		cHtmlChannelList(cChannelIterator *Iterator, eStreamType StreamType, const char *Self, const char *GroupTarget);
@@ -130,7 +135,16 @@ class cM3uChannelList: public cChannelList
 		cCharSetConv m_IConv;
 #endif
 	public:
-		virtual std::string HttpHeader() { return cChannelList::HttpHeader() + "Content-type: audio/x-mpegurl\r\n"; };
+		virtual std::string HttpHeader() {
+			return cChannelList::HttpHeader()
+				+ "Content-type: audio/x-mpegurl; charset="
+#if defined(APIVERSNUM) && APIVERSNUM >= 10503
+				+ "UTF-8"
+#else
+				+ I18nCharSets()[Setup.OSDLanguage]
+#endif
+				+ "\r\n";
+		}
 		virtual bool HasNext();
 		virtual std::string Next();
 		cM3uChannelList(cChannelIterator *Iterator, const char* Base);
-- 
cgit v1.2.3