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

[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  e577ba8c5cbb4f19191fbc4c9bdd0261b75ef1f4 (commit)
      from  c6116b3f7eb2d657141a55afa66d573fd1cda7af (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=e577ba8c5cbb4f19191fbc4c9bdd0261b75ef1f4


commit e577ba8c5cbb4f19191fbc4c9bdd0261b75ef1f4
Author: Sandro Santilli <address@hidden>
Date:   Sun Oct 3 22:58:12 2010 +0200

    Remove old TODO note (all done already)

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index b1caf8a..9084039 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -701,7 +701,8 @@ CurlStreamFile::fillCache(std::streamsize size)
 #endif
         if ( ! ret )
         {
-            // timeout
+            // Timeout, check the clock to see
+            // if we expired the user Timeout
 #ifdef GNASH_CURL_VERBOSE
             log_debug("select() timed out, elapsed is %u",
                     lastProgress.elapsed());
@@ -716,18 +717,13 @@ CurlStreamFile::fillCache(std::streamsize size)
         }
         else
         {
+            // Activity, reset the timer...
 #ifdef GNASH_CURL_VERBOSE
             log_debug("FD activity, resetting progress timer");
 #endif
             lastProgress.restart();
         }
 
-
-        // TODO: check if we timedout or got some data
-        //       if we did timeout, check the clock to see
-        //       if we expired the user Timeout, otherwise
-        //       reset the timer...
-
     }
 
     // Processing messages is already done by fillCacheNonBlocking,

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

Summary of changes:
 libbase/curl_adapter.cpp |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash