[Gnash-commit] gnash ChangeLog server/impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/17 13:40:33

Modified files:
        .              : ChangeLog 
        server         : impl.cpp 

Log message:
        * server/impl.cpp (create_library_movie): normalize real url when using 
it as a cache label.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1649&r2=1.1650
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.73&r2=1.74

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1649
retrieving revision 1.1650
diff -u -b -r1.1649 -r1.1650
--- ChangeLog   17 Nov 2006 13:19:42 -0000      1.1649
+++ ChangeLog   17 Nov 2006 13:40:33 -0000      1.1650
@@ -1,5 +1,7 @@
 2006-11-17 Sandro Santilli <address@hidden>
 
+       * server/impl.cpp (create_library_movie): normalize real url
+         when using it as a cache label.
        * server/impl.cpp (create_library_movie): don't start loader
          thread before the created movie is added to the library.
          This is to handle a parser that tries to load again the

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/impl.cpp     17 Nov 2006 13:32:53 -0000      1.73
+++ server/impl.cpp     17 Nov 2006 13:40:33 -0000      1.74
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.cpp,v 1.73 2006/11/17 13:32:53 strk Exp $ */
+/* $Id: impl.cpp,v 1.74 2006/11/17 13:40:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -666,14 +666,14 @@
 //    log_msg("%s: url is %s", __PRETTY_FUNCTION__, url.str().c_str());
 
     // Use real_url as label for cache if available 
-    std::string cache_label = real_url ? real_url : url.str();
+    std::string cache_label = real_url ? URL(real_url).str() : url.str();
 
     // Is the movie already in the library?
     {
        boost::intrusive_ptr<movie_definition>  m;
        if ( s_movie_library.get(cache_label, &m) )
            {
-               log_msg(" movie %s already in library", cache_label.c_str());
+               log_msg("Movie %s already in library", cache_label.c_str());
                // Return cached movie.
                // m->add_ref(); let caller add the ref, if needed
                return m.get();
@@ -688,13 +688,14 @@
 
        if (mov == NULL)
        {
-               log_error("couldn't load library movie '%s'\n",
+               log_error("Couldn't load library movie '%s'\n",
                        url.str().c_str());
                return NULL;
        }
 
        // Movie is good, add to the library 
        s_movie_library.add(cache_label, mov);
+       log_msg("Movie %s added to library", cache_label.c_str());
 
        // Now complete the load if the movie is an SWF movie
        //