rpms/vdr-wapd/devel vdr-wapd-0.9-condwait.patch, NONE, 1.1 vdr-wapd.spec, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr-wapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20183

Modified Files:
	vdr-wapd.spec 
Added Files:
	vdr-wapd-0.9-condwait.patch 
Log Message:
* Sun Mar 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.9-3
- Patch to fix crash at shutdown.


vdr-wapd-0.9-condwait.patch:

--- NEW FILE vdr-wapd-0.9-condwait.patch ---
Fixes crash at shutdown.

diff -up wapd-0.9/server.c~ wapd-0.9/server.c
--- wapd-0.9/server.c~	2008-01-19 16:41:46.000000000 +0200
+++ wapd-0.9/server.c	2008-03-16 13:20:33.000000000 +0200
@@ -81,7 +81,7 @@ cWapServer::cWapServer(int Port) : cThre
 
 cWapServer::~cWapServer()
 {
-  Cancel(0);
+  Cancel(3);
   free(buffer);
 }
 
@@ -1082,11 +1082,12 @@ bool cWapServer::Option(const char *Name
 
 void cWapServer::Action(void)
 {
-  usleep(5000000); //initial delay
+  cCondWait::SleepMs(5000); // Initial delay
   isyslog("WAPD: finished initial delay");
-  while (1) {
+  while (Running()) {
+     cCondWait::SleepMs(10);
      if (file.Open(socket.Accept())) {
-        if (ProcessHeader()) {
+        if (Running() && ProcessHeader()) {
            if (*authorization == 0 || !WapAccess.Acceptable(authorization))
               Header(401, "Unauthorized", MIME_TYPE, SERVER_NAME);
            else if (strncmp(uri, URI_SCHEDULE, sizeof(URI_SCHEDULE)) == 0)
@@ -1130,7 +1131,6 @@ void cWapServer::Action(void)
         }
         file.Close();
      }
-     usleep(10000);
   }
 }
 


Index: vdr-wapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-wapd/devel/vdr-wapd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-wapd.spec	16 Feb 2008 11:04:23 -0000	1.5
+++ vdr-wapd.spec	16 Mar 2008 13:55:57 -0000	1.6
@@ -8,7 +8,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WAP remote control interface for VDR
 
 Group:          Applications/Multimedia
@@ -22,6 +22,7 @@
 Patch0:         %{name}-0.9-i18n.patch
 Patch1:         %{name}-0.9-signedness.patch
 Patch2:         %{name}-0.9-headers.patch
+Patch3:         %{name}-0.9-condwait.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.4.4
@@ -38,6 +39,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 iconv -f iso-8859-1 -t utf-8 HISTORY > HISTORY.utf8 ; mv HISTORY.utf8 HISTORY
 sed -i -e 's|/video/plugins|%{configdir}/plugins|' README
 install -pm 644 %{SOURCE3} %{name}-httpd.conf
@@ -75,6 +77,9 @@
 
 
 %changelog
+* Sun Mar 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.9-3
+- Patch to fix crash at shutdown.
+
 * Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.9-2
 - Rebuild.