win32: blind attempt at fixing RTSP connection (hopefully fixes #2560)

That being noted, I would advocate ditching all RTSP control connection
timeouts from our live555 plugins. Looking at strace, live555 waits
forever in the middle of receiving RTSP messages anyway.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2f8e47b7792f887b7f1be9eb56cba95ec7c67cc3..523edda273fe78f6853fe651158b6882569e1a8a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1265,6 +1265,7 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-noapps.patch
        patch -p0 < Patches/live-uselocale.patch
+       patch -p0 < Patches/live-win32-nonblock.patch
 
 .live: live
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/live-win32-nonblock.patch b/extras/contrib/src/Patches/live-win32-nonblock.patch
new file mode 100644 (file)
index 0000000..f6d3bdf
--- /dev/null
+++ b/extras/contrib/src/Patches/live-win32-nonblock.patch
@@ -0,0 +1,13 @@
+Copyright (C) 2009 Rémi Denis-Courmont. Licensed under GPLv2 or higher.
+diff -Nru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
+--- live.orig/liveMedia/RTSPClient.cpp 2009-04-05 20:38:11.000000000 +0300
++++ live/liveMedia/RTSPClient.cpp      2009-04-05 20:39:43.000000000 +0300
+@@ -1835,7 +1835,7 @@
+       }
+       if (connect(fInputSocketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
+ #if defined(__WIN32__) || defined(_WIN32)
+-        if (errno != WSAEINPROGRESS) {
++        if (errno != WSAEWOULDBLOCK) {
+ #else
+         if (errno != EINPROGRESS) {
+ #endif