[Gnash-commit] gnash ChangeLog server/asobj/MovieClipLoader.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/27 13:37:47

Modified files:
        .              : ChangeLog 
        server/asobj   : MovieClipLoader.cpp 

Log message:
                * server/asobj/MovieClipLoader.cpp (moviecliploader_loadclip):
                  resolve relative URLS against base url, not target movie url.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.939&r2=1.940
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -b -r1.939 -r1.940
--- ChangeLog   27 Sep 2006 13:22:00 -0000      1.939
+++ ChangeLog   27 Sep 2006 13:37:47 -0000      1.940
@@ -1,5 +1,10 @@
 2006-09-27 Sandro Santilli  <address@hidden>
 
+       * server/asobj/MovieClipLoader.cpp (moviecliploader_loadclip):
+         resolve relative URLS against base url, not target movie url.
+
+2006-09-27 Sandro Santilli  <address@hidden>
+
        * server/impl.cpp, server/gnash.h: changed get_base_url() to
          return a "const" URL.
        * server/swf/ASHandlers.cpp (CommonGetUrl): use base url

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/MovieClipLoader.cpp    26 Aug 2006 13:09:53 -0000      1.2
+++ server/asobj/MovieClipLoader.cpp    27 Sep 2006 13:37:47 -0000      1.3
@@ -246,10 +246,11 @@
        log_msg("load clip: %s, target is: %p\n",
                tu_url.c_str(), (void*)target);
 
-       // Get a pointer to target's sprite parent (for URL resolution)
+       // Get a pointer to target's sprite parent 
        character* parent = target->get_parent();
        assert(parent);
 
+#if 0 // urls are resolved relative to base url !
        //
        // Extract root movie URL 
        // @@ could be cached somewhere...
@@ -273,6 +274,9 @@
        // the variable inside the block.
        //
        URL url(tu_url.c_str(), URL(parent_url.to_string()));
+#else
+       URL url(tu_url.c_str(), get_base_url());
+#endif
        
        log_msg(" resolved url: %s\n", url.str().c_str());