[Gnash-commit] /srv/bzr/gnash/rtmp r9775: block on the blocked set of signals.

[rob]

------------------------------------------------------------
revno: 9775
committer: address@hidden
branch nick: rtmp
timestamp: Sun 2008-11-23 19:32:07 -0700
message:
  block on the blocked set of signals.
modified:
  libnet/network.cpp

=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp        2008-11-22 18:25:08 +0000
+++ b/libnet/network.cpp        2008-11-24 02:32:07 +0000
@@ -307,9 +307,9 @@
        tval.tv_sec = 1;
        tval.tv_nsec = 0;
         if (block) {
-           ret = pselect(fd+1, &fdset, NULL, NULL, NULL, &emptyset);
+           ret = pselect(fd+1, &fdset, NULL, NULL, NULL, &blockset);
        } else {
-           ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &emptyset);
+           ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
        }
        if (sig_number) {
            log_debug("Have a SIGINT interupt waiting!");
@@ -850,7 +850,7 @@
 #endif
         if (timeout == 0) {
 #ifdef HAVE_PSELECT
-           ret = pselect(fd+1, &fdset, NULL, NULL, NULL, &emptyset);
+           ret = pselect(fd+1, &fdset, NULL, NULL, NULL, &blockset);
 #else
            ret = select(fd+1, &fdset, NULL, NULL, NULL);
 #endif
@@ -858,7 +858,7 @@
 #ifdef HAVE_PSELECT
            tval.tv_sec = timeout;
            tval.tv_nsec = 0;
-           ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &emptyset);
+           ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
            sigpending(&pending);
            if (sigismember(&pending, SIGINT)) {
                log_debug("Have a pending SIGINT interupt waiting!");
@@ -984,7 +984,7 @@
 #ifdef HAVE_PSELECT
        tval.tv_sec = timeout;
        tval.tv_nsec = 0;
-       ret = pselect(fd+1, NULL, &fdset, NULL, &tval, &emptyset);
+       ret = pselect(fd+1, NULL, &fdset, NULL, &tval, &blockset);
        sigpending(&pending);
        if (sigismember(&pending, SIGINT)) {
            log_debug("Have a pending SIGINT interupt waiting!");