diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | server/menuHTTP.h | 9 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 263d3e7..064b8b1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -35,6 +35,7 @@ Rolf Ahrenberg for improving externremux script termination for fixing PAT repacker version field for improving LIMIKUUTIO and PARENTALRATING patch detection + for suggesting to include the charset in HTTP replies Rantanen Teemu for providing vdr-incompletesections.diff @@ -1,6 +1,7 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- report charset in HTTP replies (suggested by Rolf Ahrenberg) - use SO_KEEPALIVE option on all sockets do detect dead sockets (thanks to owagner) - enable PatFilter for externremux, so VLC can be used as remuxer or client diff --git a/server/menuHTTP.h b/server/menuHTTP.h index fa699b9..cbd7b59 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=" + + (cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8") + + "\r\n"; + } virtual bool HasNext(); virtual std::string Next(); cHtmlChannelList(cChannelIterator *Iterator, eStreamType StreamType, const char *Self, const char *GroupTarget); @@ -128,7 +133,7 @@ class cM3uChannelList: public cChannelList eM3uState m3uState; cCharSetConv m_IConv; 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=UTF-8\r\n"; }; virtual bool HasNext(); virtual std::string Next(); cM3uChannelList(cChannelIterator *Iterator, const char* Base); |