From a047fc7d3245cfe924fb804c9c98634e634af5be Mon Sep 17 00:00:00 2001 From: Frank Schmirler Date: Thu, 1 Mar 2012 09:01:37 +0100 Subject: Report the server-side HTTP status "503 Service unavailable" instead of the client-side error "409 Conflict" when a channel is unavailable (suggested by Methodus) --- CONTRIBUTORS | 4 ++++ HISTORY | 3 +++ server/connectionHTTP.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 90c2cfc..e5d88dd 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -200,3 +200,7 @@ Ville Skytt for restricting VTP command RENR to liemikuutio patch < 1.32 for fixing memory and filedescriptor leaks in libdvbmpeg for code cleanup and optimization + +Methodus + for suggesting to use HTTP code 503 for unavailable channels + diff --git a/HISTORY b/HISTORY index c714615..81d476b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,9 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- Report the server-side HTTP status "503 Service unavailable" instead of + the client-side error "409 Conflict" when a channel is unavailable + (suggested by Methodus) - Update of po headers and Finnish translation (thanks to Rolf Ahrenberg) - support for non-cycle-free setups (e.g. where two VDRs mutually share their DVB cards through streamdev-client/-server). Must be enabled in diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index 937f7ec..695b6ee 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -179,7 +179,7 @@ bool cConnectionHTTP::ProcessRequest(void) DELETENULL(m_LiveStreamer); } DeferClose(); - return Respond("HTTP/1.0 409 Channel not available") + return Respond("HTTP/1.0 503 Service unavailable") && Respond(""); } else { @@ -212,7 +212,7 @@ bool cConnectionHTTP::ProcessRequest(void) && Respond(""); } } - return Respond("HTTP/1.0 409 Channel not available") + return Respond("HTTP/1.0 503 Service unavailable") && Respond(""); } else { -- cgit v1.2.3