[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 26d687ee1786cd0f1c52
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 26d687ee1786cd0f1c5231d0433c39066f492afb |
Date: |
Sun, 03 Oct 2010 22:22:08 +0000 |
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 26d687ee1786cd0f1c5231d0433c39066f492afb (commit)
via d7753930b9f710c6ee60af6d536d08e672db1491 (commit)
from e577ba8c5cbb4f19191fbc4c9bdd0261b75ef1f4 (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=26d687ee1786cd0f1c5231d0433c39066f492afb
commit 26d687ee1786cd0f1c5231d0433c39066f492afb
Merge: d775393 e577ba8
Author: Rob Savoye <address@hidden>
Date: Sun Oct 3 16:21:46 2010 -0600
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
diff --cc libbase/curl_adapter.cpp
index 7e6dc7e,9084039..36cdc2a
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@@ -660,19 -661,9 +661,15 @@@ CurlStreamFile::fillCache(std::streamsi
#if GNASH_CURL_VERBOSE
log_debug("No filedescriptors; breaking");
#endif
- break;
- }
+ if (userTimeout && lastProgress.elapsed() > userTimeout) {
+ log_error(_("FIXME: Timeout (%u milliseconds) while loading "
+ "from url %s"), userTimeout, _url);
+ break;
+ } else {
+ continue;
+ }
+ }
- FD_ZERO(&readfd);
- FD_ZERO(&writefd);
- FD_ZERO(&exceptfd);
-
tv.tv_sec = 0;
tv.tv_usec = maxSleepUsec;
http://git.savannah.gnu.org/cgit//commit/?id=d7753930b9f710c6ee60af6d536d08e672db1491
commit d7753930b9f710c6ee60af6d536d08e672db1491
Author: Rob Savoye <address@hidden>
Date: Sun Oct 3 16:20:37 2010 -0600
give more time to DNS resolving so we can still connect with versions of
libcurl newer than 7.21.x.
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 4604bee..7e6dc7e 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -660,8 +660,14 @@ CurlStreamFile::fillCache(std::streamsize size)
#if GNASH_CURL_VERBOSE
log_debug("No filedescriptors; breaking");
#endif
- break;
- }
+ if (userTimeout && lastProgress.elapsed() > userTimeout) {
+ log_error(_("FIXME: Timeout (%u milliseconds) while loading "
+ "from url %s"), userTimeout, _url);
+ break;
+ } else {
+ continue;
+ }
+ }
FD_ZERO(&readfd);
FD_ZERO(&writefd);
-----------------------------------------------------------------------
Summary of changes:
libbase/curl_adapter.cpp | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 26d687ee1786cd0f1c5231d0433c39066f492afb,
Rob Savoye <=