[Gnash-dev] HAVE_CURL_CURL_H obsolete? (bug #17616 related) [patch]

[annonygmouse]

Hi, I've been trying to get 
http://www.garfield.com/comics/comics_todays.html to work.

The problem is that there's a flash file lower_todayscomic.swf where
four flash files are rendered.

It didn't work because gnash tried to load the flash files:
../features/BMFs/lower21.swf
as relative URL to the PWD of gnash process.

What I've done is to modify ASHandlers.cpp in order to pass
the ABSOLUTE URL to attach_extern_movie.

I've also had to comment out some defines that didn't allow 
StreanProvider to make use of CURL.

I'm not sure if this may brake other SWF I've tested the flash files 
from testsuite and all seem to work properly.

Now http://www.garfield.com/comics/comics_todays.html works properly for me.

Kind regards
Sebastià

? load_flash_from_url_properly.diff
? lower13.swf
? gui/NullGui.lo
? gui/gnash
? gui/gtk.lo
? gui/gtk_glue_gtkglext.lo
? gui/gui.lo
? gui/libgnashgui.la
? libamf/.libs
? libamf/amf.lo
? libamf/libgnashamf.la
? libamf/rtmp.lo
? plugin/np_entry.lo
? plugin/npn_gate.lo
? plugin/npp_gate.lo
? plugin/klash/.libs
? plugin/klash/klash
? plugin/klash/klash.moc
? plugin/klash/klash_part.lo
? plugin/klash/klash_part.moc
? plugin/klash/libklashpart.la
? server/parser/.deps
? server/parser/.libs
? server/parser/Makefile
? server/parser/Makefile.in
? server/parser/action_buffer.lo
? server/parser/button_character_def.lo
? server/parser/character_def.lo
? server/parser/edit_text_character_def.lo
? server/parser/libgnashparser.la
? server/parser/morph2_character_def.lo
? server/parser/movie_def_impl.lo
? server/parser/shape_character_def.lo
? server/parser/sprite_definition.lo
? server/parser/text_character_def.lo
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.13
diff -u -p -u -r1.13 curl_adapter.cpp
--- libbase/curl_adapter.cpp    31 Aug 2006 00:49:49 -0000      1.13
+++ libbase/curl_adapter.cpp    15 Sep 2006 22:53:30 -0000
@@ -42,9 +42,9 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_CURL_CURL_H
+//#ifdef HAVE_CURL_CURL_H
 # define HAVE_LIBCURL 1
-#endif
+//#endif
 
 #include "curl_adapter.h"
 #include "tu_file.h"
Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.10
diff -u -p -u -r1.10 StreamProvider.cpp
--- server/StreamProvider.cpp   28 Aug 2006 18:47:01 -0000      1.10
+++ server/StreamProvider.cpp   15 Sep 2006 22:53:30 -0000
@@ -40,9 +40,9 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_CURL_CURL_H
+//#ifdef HAVE_CURL_CURL_H
 #define USE_CURL 1
-#endif
+//#endif
 
 #include "StreamProvider.h"
 #include "URL.h"
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.56
diff -u -p -u -r1.56 impl.cpp
--- server/impl.cpp     2 Sep 2006 00:37:30 -0000       1.56
+++ server/impl.cpp     15 Sep 2006 22:53:30 -0000
@@ -439,7 +439,7 @@ create_movie(const URL& url, const char*
        }
        else if (in->get_error())
        {
-           log_error("streamProvider opener can't open '%s'\n", c_url);
+           log_error("streamProvider opener can't open '%s' (real_url:%s)\n", 
c_url,reset_url);
            return NULL;
        }
 
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.62
diff -u -p -u -r1.62 ASHandlers.cpp
--- server/swf/ASHandlers.cpp   14 Sep 2006 17:03:52 -0000      1.62
+++ server/swf/ASHandlers.cpp   15 Sep 2006 22:53:30 -0000
@@ -1606,7 +1606,7 @@ SWFHandlers::CommonGetUrl(as_environment
                if (target_movie != NULL)
                {
                        sprite_instance* root_movie = 
env.get_target()->get_root_movie();
-                       attach_extern_movie(url_c, target_movie, root_movie);
+                       attach_extern_movie(url.str().c_str(), target_movie, 
root_movie);
                }
                else
                {