From d2769982da50332c9354344e2e196f581f7d888b Mon Sep 17 00:00:00 2001 From: geronimo Date: Fri, 27 Jul 2012 07:18:23 +0200 Subject: remove yajl dependency, handle connection abort if client closes connection during play --- libs/networking/src/ConnectionHandler.cc | 13 +++++++------ libs/networking/src/HTTPResponse.cc | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'libs/networking/src') diff --git a/libs/networking/src/ConnectionHandler.cc b/libs/networking/src/ConnectionHandler.cc index 9ad24a6..abed00f 100644 --- a/libs/networking/src/ConnectionHandler.cc +++ b/libs/networking/src/ConnectionHandler.cc @@ -1,25 +1,25 @@ /** * ======================== legal notice ====================== - * + * * File: ConnectionHandler.cc * Created: 4. Juli 2012, 07 * Author: Geronimo * Project: libnetworking: classes for tcp/ip sockets and http-protocol handling - * + * * CMP - compound media player - * + * * is a client/server mediaplayer intended to play any media from any workstation * without the need to export or mount shares. cmps is an easy to use backend * with a (ready to use) HTML-interface. Additionally the backend supports * authentication via HTTP-digest authorization. * cmpc is a client with vdr-like osd-menues. - * + * * Copyright (c) 2012 Reinhard Mantey, some rights reserved! * published under Creative Commons by-sa * For details see http://creativecommons.org/licenses/by-sa/3.0/ - * + * * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp - * + * * -------------------------------------------------------------- */ #include @@ -369,6 +369,7 @@ void cConnectionHandler::TransferResponse(cHTTPResponse *Response) if (nTrans < 1) { esyslog("failed to transmit chunk. Error #%d", errno); + Response->HandleAbort(); break; } total += nTrans; diff --git a/libs/networking/src/HTTPResponse.cc b/libs/networking/src/HTTPResponse.cc index c49483c..e9ae8eb 100644 --- a/libs/networking/src/HTTPResponse.cc +++ b/libs/networking/src/HTTPResponse.cc @@ -1,25 +1,25 @@ /** * ======================== legal notice ====================== - * + * * File: HTTPResponse.cc * Created: 4. Juli 2012, 06 * Author: Geronimo * Project: libnetworking: classes for tcp/ip sockets and http-protocol handling - * + * * CMP - compound media player - * + * * is a client/server mediaplayer intended to play any media from any workstation * without the need to export or mount shares. cmps is an easy to use backend * with a (ready to use) HTML-interface. Additionally the backend supports * authentication via HTTP-digest authorization. * cmpc is a client with vdr-like osd-menues. - * + * * Copyright (c) 2012 Reinhard Mantey, some rights reserved! * published under Creative Commons by-sa * For details see http://creativecommons.org/licenses/by-sa/3.0/ - * + * * The cmp project's homepage is at http://projects.vdr-developer.org/projects/cmp - * + * * -------------------------------------------------------------- */ #include @@ -80,6 +80,12 @@ void cHTTPResponse::SetDefaultStatusBody(HTTPStatusCode Status) "\n"); } +void cHTTPResponse::HandleAbort(void) +///< handle cases where client closes connection while transfer was in progress +{ + // default: do nothing +} + size_t cHTTPResponse::ReadContentChunk(char* Buf, size_t bufSize) { return content.Copy(Buf, bufSize); -- cgit v1.2.3