From 18080fafe37ccc18173099343ac06ce4d9ad7681 Mon Sep 17 00:00:00 2001 From: methodus Date: Thu, 15 Nov 2012 17:37:01 +0100 Subject: Fixed some minor issues with request timeout --- common/setup.cpp | 2 +- httptnt/resourceStreamer.ecpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/setup.cpp b/common/setup.cpp index f3baf76..b559aee 100644 --- a/common/setup.cpp +++ b/common/setup.cpp @@ -36,7 +36,7 @@ void cMenuSetupUPnP::Update(){ Add(new cMenuEditStrItem(tr("Webserver root directory"), webserverRoot, STRING_SIZE)); Add(new cMenuEditIntItem(tr("Webserver port (0=auto)"), &wsport, 0, 65536)); - Add(new cMenuEditIntItem(tr("Max. request time in seconds (0=auto)"), &wsport, 0, 3600)); + Add(new cMenuEditIntItem(tr("Max. request time in seconds (0=auto)"), &mRTime, 0, 3600)); Add(new cMenuEditStrItem(tr("Presentation URL"), presentationUrl, STRING_SIZE)); diff --git a/httptnt/resourceStreamer.ecpp b/httptnt/resourceStreamer.ecpp index a7afdac..55d112b 100644 --- a/httptnt/resourceStreamer.ecpp +++ b/httptnt/resourceStreamer.ecpp @@ -102,12 +102,9 @@ using namespace upnp; size_t bytesRead = 0; char buffer[KB(16)]; while ((bytesRead = streamer->Read(buffer, KB(16))) > 0 && length) { - reply.out().write(buffer, bytesRead); + if(!(reply.out().write(buffer, bytesRead))) break; length -= bytesRead; -// if (!reply.out()) { -// code = HTTP_GONE; -// break; -// } + request.touch(); } } -- cgit v1.2.3