[Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/28 16:35:02

Modified files:
        .              : ChangeLog 
        libbase        : curl_adapter.cpp 

Log message:
        (fillCache): spaces to tabs, comments about timeout constraints.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6745&r2=1.6746
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6745
retrieving revision 1.6746
diff -u -b -r1.6745 -r1.6746
--- ChangeLog   28 May 2008 16:23:26 -0000      1.6745
+++ ChangeLog   28 May 2008 16:35:01 -0000      1.6746
@@ -1,5 +1,10 @@
 2008-05-28 Sandro Santilli <address@hidden>
 
+       * libbase/curl_adapter.cpp (fillCache): spaces to tabs, comments
+         about timeout constraints.
+
+2008-05-28 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/REALTIME: run the sec-0.6.2-local-access.as
          tests in realtime (they load an xml file).
 

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- libbase/curl_adapter.cpp    28 May 2008 15:36:18 -0000      1.54
+++ libbase/curl_adapter.cpp    28 May 2008 16:35:02 -0000      1.55
@@ -301,12 +301,6 @@
         //gnash::log_debug("cached: %d, size: %d", _cached, size);
 #endif
 
-        FD_ZERO(&readfd);
-        FD_ZERO(&writefd);
-        FD_ZERO(&exceptfd);
-        tv.tv_sec = timeout;
-        tv.tv_usec = 0;
-
         mcode = curl_multi_fdset(_mhandle, &readfd, &writefd, &exceptfd, 
&maxfd);
         if (mcode != CURLM_OK) {
             // This is a serious error, not just a failure to add any
@@ -326,6 +320,17 @@
             break;
         }
 
+               FD_ZERO(&readfd);
+               FD_ZERO(&writefd);
+               FD_ZERO(&exceptfd);
+
+               // TODO: don't wait more then curl_multi_timeout()
+               //       [ or an fixed max is that's not supported
+               //         by current curl version ]
+               tv.tv_sec = timeout;
+               tv.tv_usec = 0;
+
+
         // Wait for data on the filedescriptors until a timeout set
         // in gnashrc.
         select(maxfd + 1, &readfd, &writefd, &exceptfd, &tv);