summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-08-30 10:14:42 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-08-30 10:14:42 +0200
commit37c340e51a91816d520181291254e55ecaa9fc32 (patch)
tree5e3719b19306c542f8fb45b14eade20c843311fd
parent642f8c0f13f3fea3c98c2938e780d69ee247d3a8 (diff)
downloadvdr-37c340e51a91816d520181291254e55ecaa9fc32.tar.gz
vdr-37c340e51a91816d520181291254e55ecaa9fc32.tar.bz2
Fixed a hangup in SVDRP when the client disappears without sending QUIT
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY3
-rw-r--r--svdrp.c4
3 files changed, 9 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6cf972d9..65d44f7e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -777,3 +777,6 @@ Javier Marcet <lists@marcet.info>
Peter Waechtler <pwaechtler@mac.com>
for adding channels for DVB-T Hannover (Germany) to channels.cont.terr
+
+Robert Bartl <robert@bartl.priv.at>
+ for reporting a hangup in SVDRP when the client disappears without sending QUIT
diff --git a/HISTORY b/HISTORY
index c31330d7..afdb726f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2336,3 +2336,6 @@ Video Disk Recorder Revision History
to Lauri Tischler and Ragnar Sundblad).
- Added channels for DVB-T Hannover (Germany) to channels.cont.terr (thanks to
Peter Waechtler).
+- Fixed a hangup in SVDRP when the client disappears without sending QUIT (thanks
+ to Robert Bartl for reporting this one). The problem was introduced in version
+ 1.2.2 through the fix for an occasional "Broken pipe" error in SVDRP connections.
diff --git a/svdrp.c b/svdrp.c
index 625b7f83..c2c65948 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
- * $Id: svdrp.c 1.53 2003/07/26 10:57:33 kls Exp $
+ * $Id: svdrp.c 1.54 2003/08/30 09:35:00 kls Exp $
*/
#include "svdrp.h"
@@ -1104,6 +1104,8 @@ bool cSVDRP::Process(void)
isyslog("lost connection to SVDRP client");
Close();
}
+ else
+ break;
}
if (Setup.SVDRPTimeout && time(NULL) - lastActivity > Setup.SVDRPTimeout) {
isyslog("timeout on SVDRP connection");