diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-10-24 08:44:31 +0200 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-10-24 08:44:31 +0200 |
| commit | 077398fdef39b5d2f4901b87417f0a80ef19da6c (patch) | |
| tree | b64ee0b3df0cdb5b91c4a99c4ebe2724ed681832 /server/connectionHTTP.c | |
| parent | bdaea38b863ef7649d7a2253ac937130b6e11d8d (diff) | |
| download | vdr-plugin-streamdev-077398fdef39b5d2f4901b87417f0a80ef19da6c.tar.gz vdr-plugin-streamdev-077398fdef39b5d2f4901b87417f0a80ef19da6c.tar.bz2 | |
Revert "dropped cServerConnection::m_Pending"
Required by VTP
This reverts commit bdaea38b863ef7649d7a2253ac937130b6e11d8d.
Diffstat (limited to 'server/connectionHTTP.c')
| -rw-r--r-- | server/connectionHTTP.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index 7dd2d11..ffcc924 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -147,7 +147,7 @@ bool cConnectionHTTP::ProcessRequest(void) esyslog("streamdev-server connectionHTTP: Missing method or pathinfo"); } else if (it_method->second.compare("GET") == 0 && ProcessURI(it_pathinfo->second)) { if (m_ChannelList) - return Respond("%s", m_ChannelList->HttpHeader().c_str()); + return Respond("%s", true, m_ChannelList->HttpHeader().c_str()); else if (m_Channel != NULL) { cDevice *device = NULL; if (ProvidesChannel(m_Channel, 0)) @@ -164,7 +164,7 @@ bool cConnectionHTTP::ProcessRequest(void) } else if (m_StreamType == stES && (m_Apid[0] || m_Dpid[0] || ISRADIO(m_Channel))) { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: audio/mpeg") - && Respond("icy-name: %s", m_Channel->Name()) + && Respond("icy-name: %s", true, m_Channel->Name()) && Respond(""); } else if (ISRADIO(m_Channel)) { return Respond("HTTP/1.0 200 OK") @@ -190,7 +190,7 @@ bool cConnectionHTTP::ProcessRequest(void) } else if (it_method->second.compare("HEAD") == 0 && ProcessURI(it_pathinfo->second)) { DeferClose(); if (m_ChannelList) - return Respond("%s", m_ChannelList->HttpHeader().c_str()); + return Respond("%s", true, m_ChannelList->HttpHeader().c_str()); else if (m_Channel != NULL) { if (ProvidesChannel(m_Channel, 0)) { if (m_StreamType == stEXT) { @@ -200,7 +200,7 @@ bool cConnectionHTTP::ProcessRequest(void) } else if (m_StreamType == stES && (m_Apid[0] || m_Dpid[0] || ISRADIO(m_Channel))) { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: audio/mpeg") - && Respond("icy-name: %s", m_Channel->Name()) + && Respond("icy-name: %s", true, m_Channel->Name()) && Respond(""); } else if (ISRADIO(m_Channel)) { return Respond("HTTP/1.0 200 OK") @@ -235,7 +235,7 @@ void cConnectionHTTP::Flushed(void) if (m_ChannelList) { if (m_ChannelList->HasNext()) { - if (!Respond("%s", m_ChannelList->Next().c_str())) + if (!Respond("%s", true, m_ChannelList->Next().c_str())) DeferClose(); } else { |