[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/netio Umakefil, 1.16, 1.16.6.1 rtspmcast.cpp,
From:       dcollins () helixcommunity ! org
Date:       2007-04-30 17:14:22
Message-ID: 200704301714.l3UHEZqA011196 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/netio
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22434/engine/netio

Modified Files:
      Tag: SERVER_BORABORA
	Umakefil rtspmcast.cpp servsockimp.cpp 
Log Message:
updates related to the SERVER_BORABORA branch, migrating code from
server_rn to server-restricted, server, etc. 
Distlic is a long-since obsoleted feature, and related code
was causing migration complexities, so it was just removed.


Index: servsockimp.cpp
===================================================================
RCS file: /cvsroot/server/engine/netio/servsockimp.cpp,v
retrieving revision 1.51
retrieving revision 1.51.6.1
diff -u -d -r1.51 -r1.51.6.1
--- servsockimp.cpp	19 Oct 2006 00:25:52 -0000	1.51
+++ servsockimp.cpp	30 Apr 2007 17:14:20 -0000	1.51.6.1
@@ -227,6 +227,11 @@
 
     m_uSelectedEventMask = uEventMask;
 
+    if (!m_pProc)
+    {
+        return HXR_OK;
+    }
+
     if (uEventMask & (HX_SOCK_EVENT_READ |
                       HX_SOCK_EVENT_ACCEPT |
                       HX_SOCK_EVENT_CLOSE))

Index: Umakefil
===================================================================
RCS file: /cvsroot/server/engine/netio/Umakefil,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -u -d -r1.16 -r1.16.6.1
--- Umakefil	21 Dec 2006 05:07:15 -0000	1.16
+++ Umakefil	30 Apr 2007 17:14:20 -0000	1.16.6.1
@@ -46,7 +46,6 @@
 	, "common/system/pub"
 	, "common/util/pub"
 	, "common/runtime/pub"
-	, "protocol-restricted/common/util"
 	, "protocol/common/util/pub"
 	, "protocol/rtsp/include"
 	, "protocol/rtsp/pub"

Index: rtspmcast.cpp
===================================================================
RCS file: /cvsroot/server/engine/netio/rtspmcast.cpp,v
retrieving revision 1.13
retrieving revision 1.13.6.1
diff -u -d -r1.13 -r1.13.6.1
--- rtspmcast.cpp	8 Mar 2007 00:17:42 -0000	1.13
+++ rtspmcast.cpp	30 Apr 2007 17:14:20 -0000	1.13.6.1
@@ -57,7 +57,6 @@
 #include "url.h"
 #include "netdrv.h"
 #include "hxtypes.h"
-#include "servchallenge.h"
 #include "player.h"
 #include "hxdeque.h"
 #include "hxstring.h"


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]