[Gnash-commit] [SCM] Gnash branch, master, updated. 28c9cf11fc8b8ac8cb65d9734e86db738ce6c722

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


commit 28c9cf11fc8b8ac8cb65d9734e86db738ce6c722
Author: Rob Savoye <address@hidden>
Date:   Sun Oct 3 17:55:55 2010 -0600

    add comment about timeouts

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 2c4b3c3..d0d7b3d 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -661,10 +661,13 @@ CurlStreamFile::fillCache(std::streamsize size)
 #if GNASH_CURL_VERBOSE
             log_debug("curl_multi_fdset: maxfd == %1%", maxfd);
 #endif
-
+           // As of libcurl 7.21.x, the DNS resolving appears to be going
+           // on in the background, so curl_multi_fdset fails to return
+           // anything useful. So we use the user timeout value to
+           // give DNS enough time to resolve the lookup.
             if (userTimeout && lastProgress.elapsed() > userTimeout) {
                 log_error(_("FIXME: Timeout (%u milliseconds) while loading "
-                    "from url %s"), userTimeout, _url);
+                           "from url %s"), userTimeout, _url);
                 // TODO: should we set _error here ?
                 return;
             } else {

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

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


hooks/post-receive
-- 
Gnash