[Gnash-commit] [SCM] Gnash branch, master, updated. e1f44fae12bac56dd14b9e1a008566dbb91a8145

[Sandro Santilli]

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, master has been updated
       via  e1f44fae12bac56dd14b9e1a008566dbb91a8145 (commit)
      from  26d687ee1786cd0f1c5231d0433c39066f492afb (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=e1f44fae12bac56dd14b9e1a008566dbb91a8145


commit e1f44fae12bac56dd14b9e1a008566dbb91a8145
Author: Sandro Santilli <address@hidden>
Date:   Mon Oct 4 00:43:46 2010 +0200

    Indentation, slightly more useful debug line

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 36cdc2a..2c4b3c3 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -659,16 +659,18 @@ CurlStreamFile::fillCache(std::streamsize size)
         // A value of -1 means no file descriptors were added.
         if (maxfd < 0) {
 #if GNASH_CURL_VERBOSE
-            log_debug("No filedescriptors; breaking");
+            log_debug("curl_multi_fdset: maxfd == %1%", maxfd);
 #endif
-           if (userTimeout && lastProgress.elapsed() > userTimeout) {
-               log_error(_("FIXME: Timeout (%u milliseconds) while loading "
-                           "from url %s"), userTimeout, _url);
-               break;
-           } else {
-               continue;
-           }
-       }
+
+            if (userTimeout && lastProgress.elapsed() > userTimeout) {
+                log_error(_("FIXME: Timeout (%u milliseconds) while loading "
+                    "from url %s"), userTimeout, _url);
+                // TODO: should we set _error here ?
+                return;
+            } else {
+                continue;
+            }
+        }
 
         tv.tv_sec = 0;
         tv.tv_usec = maxSleepUsec;

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

Summary of changes:
 libbase/curl_adapter.cpp |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Gnash