[Gnash-commit] [SCM] Gnash branch, release_0_8_9, updated. release_0_8_9_start-327-g257aa1e

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, release_0_8_9 has been updated
       via  257aa1e009741ef0e12be274f2a2c8aff96a0e00 (commit)
      from  9cb2726b7689bb1bf63dcad8f176edfd2f4ca05d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=257aa1e009741ef0e12be274f2a2c8aff96a0e00


commit 257aa1e009741ef0e12be274f2a2c8aff96a0e00
Author: Rob Savoye <address@hidden>
Date:   Fri Mar 18 07:44:55 2011 -0600

    read one byte at a time

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index b5938a1..a47a403 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -1,6 +1,6 @@
 // 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
-//   2011 Free Software Foundation, Inc
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+//   Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -678,22 +678,13 @@ nsPluginInstance::handlePlayerRequests(GIOChannel* 
iochan, GIOCondition cond)
 
     assert(cond & G_IO_IN);
 
-    assert(g_io_channel_get_flags(iochan) & G_IO_FLAG_NONBLOCK);
-
     gnash::log_debug("Checking player requests on FD #%d",
               g_io_channel_unix_get_fd(iochan));
 
-    int retries = 5;
-    const size_t buf_size = 512;
+    const size_t buf_size = 1;
     gchar buffer[buf_size];
 
     do {
-        if (retries-- <= 0) {
-            gnash::log_debug("Too many reads necessary to get all the data 
from"
-                             " the Gnash socket. Will try to get the rest 
later.");
-            break;
-        }
-
         GError* error = 0;
         gsize bytes_read = 0;
 
@@ -1290,19 +1281,6 @@ nsPluginInstance::setupIOChannel(int fd, GIOFunc 
handler, GIOCondition signals)
     GIOChannel* ichan = g_io_channel_unix_new(fd);
     g_io_channel_set_close_on_unref(ichan, true);
 
-    GError* error = 0;
-    GIOStatus rv = g_io_channel_set_flags(ichan, G_IO_FLAG_NONBLOCK,
-                                          &error);
-    if (error || rv != G_IO_STATUS_NORMAL) {
-        log_error("Could not make player communication nonblocking.");
-
-        g_io_channel_unref(ichan);
-        if (error) {
-            g_error_free(error);
-        }
-        return;
-    }
-
     gnash::log_debug("New IO Channel for fd #%d",
                      g_io_channel_unix_get_fd(ichan));
     g_io_add_watch(ichan, signals, handler, (gpointer)this); 

-----------------------------------------------------------------------

Summary of changes:
 plugin/npapi/plugin.cpp |   28 +++-------------------------
 1 files changed, 3 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Gnash