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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/29 12:26:43

Modified files:
        .              : ChangeLog 
        libbase        : curl_adapter.cpp 

Log message:
        avoid the _perform on cookies export (we need _cleanup only)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6757&r2=1.6758
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.60&r2=1.61

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6757
retrieving revision 1.6758
diff -u -b -r1.6757 -r1.6758
--- ChangeLog   29 May 2008 11:39:20 -0000      1.6757
+++ ChangeLog   29 May 2008 12:26:42 -0000      1.6758
@@ -1,5 +1,10 @@
 2008-05-29 Sandro Santilli <address@hidden>
 
+       * libbase/curl_adapter.cpp: avoid the _perform on cookies
+         export (we need _cleanup only); add note about this.
+
+2008-05-29 Sandro Santilli <address@hidden>
+
        * libbase/curl_adapter.cpp: remove confusing comment about 
          _runnign and curl_multi_info_read.
 

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- libbase/curl_adapter.cpp    29 May 2008 11:39:21 -0000      1.60
+++ libbase/curl_adapter.cpp    29 May 2008 12:26:43 -0000      1.61
@@ -1029,9 +1029,14 @@
        }
 
        // perform, to activate actual cookie file parsing
-       log_debug("Performing on the fake handle to import cookies");
-       ccode = curl_easy_perform(fakeHandle);
-       log_debug("Fake performance returned %s", curl_easy_strerror(ccode));
+       //
+       // NOTE: curl_easy_perform is expected to return an
+       //       "URL using bad/illegal format or missing URL" error,
+       //       there's no way to detect actual cookies import errors
+       //       other then using curl debugging output routines
+       //
+       log_debug("Importing cookies from file '%s'", cookiesIn);
+       curl_easy_perform(fakeHandle);
 
        curl_easy_cleanup(fakeHandle);
 
@@ -1049,7 +1054,8 @@
        //
        // We'll be creating a fake easy handle for the sole purpose
        // of exporting cookies. Tests conducted against 7.15.5-CVS
-       // resulted in this working w/out a CURLOPT_URL.
+       // resulted in this working w/out a CURLOPT_URL and w/out a
+       // curl_easy_perform.
        // 
        // NOTE: the "correct" way would be to use CURLOPT_COOKIELIST
        //       with the "FLUSH" special string as value, but that'd
@@ -1065,20 +1071,17 @@
        if ( ccode != CURLE_OK ) {
                throw gnash::GnashException(curl_easy_strerror(ccode));
        }
+
        // Configure the fake handle to write cookies to the specified file
        ccode = curl_easy_setopt(fakeHandle, CURLOPT_COOKIEJAR , cookiesOut);
        if ( ccode != CURLE_OK ) {
                throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
-       // perform, to activate actual cookie file parsing
-       log_debug("Performing on the fake handle to export cookies");
-       ccode = curl_easy_perform(fakeHandle);
-       log_debug("Fake performance returned %s", curl_easy_strerror(ccode));
-
+       // Cleanup, to trigger actual cookie file flushing
+       log_debug("Exporting cookies file '%s'", cookiesOut);
        curl_easy_cleanup(fakeHandle);
 
-       //log_error("Cookies export unimplemented yet");
 }
 
 /***********************************************************************