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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Bastiaan Jacques <bjacques>     06/11/09 13:12:25

Modified files:
        .              : ChangeLog 
        libbase        : curl_adapter.cpp 

Log message:
        Allow libcurl to follow HTTP redirects.
                Don't forget to store curl_easy_setopt()'s return value, in 
addition
                to checking it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.131&r2=1.1412.2.132
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.16.2.1&r2=1.16.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.131
retrieving revision 1.1412.2.132
diff -u -b -r1.1412.2.131 -r1.1412.2.132
--- ChangeLog   9 Nov 2006 12:30:41 -0000       1.1412.2.131
+++ ChangeLog   9 Nov 2006 13:12:24 -0000       1.1412.2.132
@@ -1,3 +1,9 @@
+2006-11-09 Bastiaan Jacques <address@hidden>
+
+       * libbase/curl_adapter.cpp: Allow libcurl to follow HTTP redirects.
+       Don't forget to store curl_easy_setopt()'s return value, in addition
+       to checking it.
+
 2006-11-09 Sandro Santilli <address@hidden>
 
         * server/URLAccessManager.cpp (host_check): use log_security()

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- libbase/curl_adapter.cpp    30 Oct 2006 14:28:47 -0000      1.16.2.1
+++ libbase/curl_adapter.cpp    9 Nov 2006 13:12:25 -0000       1.16.2.2
@@ -16,7 +16,7 @@
 
 // 
 
-/* $Id: curl_adapter.cpp,v 1.16.2.1 2006/10/30 14:28:47 rsavoye Exp $ */
+/* $Id: curl_adapter.cpp,v 1.16.2.2 2006/11/09 13:12:25 bjacques Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -305,17 +305,22 @@
 
 
        // set write data and function
-       curl_easy_setopt(_handle, CURLOPT_WRITEDATA, this);
+       ccode = curl_easy_setopt(_handle, CURLOPT_WRITEDATA, this);
        if ( ccode != CURLE_OK ) {
                throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
-       curl_easy_setopt(_handle, CURLOPT_WRITEFUNCTION,
+       ccode = curl_easy_setopt(_handle, CURLOPT_WRITEFUNCTION,
                CurlStreamFile::recv);
        if ( ccode != CURLE_OK ) {
                throw gnash::GnashException(curl_easy_strerror(ccode));
        }
 
+       ccode = curl_easy_setopt(_handle, CURLOPT_FOLLOWLOCATION, 1);
+       if ( ccode != CURLE_OK ) {
+               throw gnash::GnashException(curl_easy_strerror(ccode));
+       }
+
        // CURLMcode ret = 
        mcode = curl_multi_add_handle(_mhandle, _handle);
        if ( mcode != CURLM_OK ) {