Update to 5.5.5.

Requested by:	many people

2 files changed, 0 insertions, 36 deletions

diff --git a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp b/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
deleted file mode 100644
index 31bb480f960f..000000000000
--- a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Thu Sep 30 23:40:54 2004
-+++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Sun Jul 10 15:16:15 2005
-@@ -381,11 +381,11 @@
-     // specified by the source info, we can use that to demultiplex separate broadcasts on
-     // the same port. If the src IP addr is 0, we cannot do this and must dedicate 1 port per
-     // broadcast
--    fSockets = sSocketPool.GetUDPSocketPair(INADDR_ANY, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-+    fSockets = sSocketPool.GetUDPSocketPair(fStreamInfo.fDestIPAddr, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-     if ((fSockets == NULL) && fStreamInfo.fSetupToReceive)
-     {
-         fStreamInfo.fPort = 0;
--        fSockets = sSocketPool.GetUDPSocketPair(INADDR_ANY, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-+        fSockets = sSocketPool.GetUDPSocketPair(fStreamInfo.fDestIPAddr, fStreamInfo.fPort, fStreamInfo.fSrcIPAddr, 0);
-     }
-     if (fSockets == NULL)
-         return QTSSModuleUtils::SendErrorResponse(inRequest, qtssServerInternal,
-@@ -1388,7 +1388,7 @@
-         {   
-             // Check to see if we need to set the remote RTCP address
-             // for this stream. This will be necessary if the source is unicast.
--            if ((theRemoteAddr != 0) && (theSender->fStream->fDestRTCPAddr == 0))
-+            if ((theRemoteAddr != 0) && (theSender->fStream->fDestRTCPAddr == 0) && (thePacket->IsRTCP()))
-             {
-                 // If the source is multicast, this shouldn't be necessary
-                 Assert(!SocketUtils::IsMulticastIPAddr(theSender->fStream->fStreamInfo.fDestIPAddr));
diff --git a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp b/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
deleted file mode 100644
index adf025f249e5..000000000000
--- a/net/DarwinStreamingServer/files/patch-StreamingLoadTool-StreamingLoadTool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- StreamingLoadTool/StreamingLoadTool.cpp.orig	Thu May 26 12:36:32 2005
-+++ StreamingLoadTool/StreamingLoadTool.cpp	Sat Feb 10 04:01:06 2007
-@@ -191,7 +191,7 @@
- 	UInt32* theURLIndexArray = NEW UInt32[theURLIndexArraySize];
- 	UInt32 theNumURLs = 0;
-     char* controlID = NULL;
--	char			ch = 0;
-+	int			ch = 0;
- 	//
- 	// Read our command line options
- 	while( (ch = getopt(argc, argv, "vf:c:i:d")) != -1 )