diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2008-04-20 00:57:50 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2008-04-20 00:57:50 (GMT) |
commit | 41710698a04c20e566fcb2c152802c1e38cb6316 (patch) | |
tree | 2ac4007972081640419fceb63116664fb6642236 /config/modulesets/patches/libjingle_ignore_invalid_sockets.patch | |
parent | 9f2bbbbebfa7b6f2de89520c6f591549d1ae2667 (diff) |
Patches needs to be under modulesets so that jhbuild can find them.
Diffstat (limited to 'config/modulesets/patches/libjingle_ignore_invalid_sockets.patch')
-rw-r--r-- | config/modulesets/patches/libjingle_ignore_invalid_sockets.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/config/modulesets/patches/libjingle_ignore_invalid_sockets.patch b/config/modulesets/patches/libjingle_ignore_invalid_sockets.patch new file mode 100644 index 0000000..30af0a5 --- /dev/null +++ b/config/modulesets/patches/libjingle_ignore_invalid_sockets.patch @@ -0,0 +1,21 @@ +diff -rN -up old-libjingle/talk/base/physicalsocketserver.cc new-libjingle/talk/base/physicalsocketserver.cc +--- old-libjingle/talk/base/physicalsocketserver.cc 2007-05-01 17:02:49.000000000 +0100 ++++ new-libjingle/talk/base/physicalsocketserver.cc 2007-05-01 17:02:49.000000000 +0100 +@@ -885,6 +885,8 @@ bool PhysicalSocketServer::Wait(int cmsW + if (!process_io && (pdispatcher != signal_wakeup_)) + continue; + int fd = pdispatcher->GetDescriptor(); ++ if (fd == INVALID_SOCKET) ++ continue; + if (fd > fdmax) + fdmax = fd; + uint32 ff = pdispatcher->GetRequestedEvents(); +@@ -919,6 +921,8 @@ bool PhysicalSocketServer::Wait(int cmsW + for (unsigned i = 0; i < dispatchers_.size(); i++) { + Dispatcher *pdispatcher = dispatchers_[i]; + int fd = pdispatcher->GetDescriptor(); ++ if (fd == INVALID_SOCKET) ++ continue; + uint32 ff = 0; + if (FD_ISSET(fd, &fdsRead)) { + FD_CLR(fd, &fdsRead); |