[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp [gnash_0_8_3_branch]
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp [gnash_0_8_3_branch] |
Date: |
Sat, 17 May 2008 09:37:01 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: gnash_0_8_3_branch
Changes by: Sandro Santilli <strk> 08/05/17 09:37:01
Modified files:
. : ChangeLog
gui : Player.cpp
Log message:
* gui/Player.cpp (run): support relative urls in 'base' parameter,
always resolve against baseurl given with -U or derived from -u
or filename. Fixes bug #23260.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.20&r2=1.6573.2.21
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.109&r2=1.109.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.20
retrieving revision 1.6573.2.21
diff -u -b -r1.6573.2.20 -r1.6573.2.21
--- ChangeLog 16 May 2008 20:17:00 -0000 1.6573.2.20
+++ ChangeLog 17 May 2008 09:36:57 -0000 1.6573.2.21
@@ -1,3 +1,9 @@
+2008-05-17 Sandro Santilli <address@hidden>
+
+ * gui/Player.cpp (run): support relative urls in 'base' parameter,
+ always resolve against baseurl given with -U or derived from -u
+ or filename. Fixes bug #23260.
+
2008-05-16 Russ Nelson <address@hidden>
* testsuite/media/Bitstream Vera Sans.COPYRIGHT rename to:
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.109
retrieving revision 1.109.2.1
diff -u -b -r1.109 -r1.109.2.1
--- gui/Player.cpp 5 May 2008 18:58:04 -0000 1.109
+++ gui/Player.cpp 17 May 2008 09:37:00 -0000 1.109.2.1
@@ -320,6 +320,12 @@
// Parse querystring (before FlashVars, see
testsuite/misc-ming.all/FlashVarsTest*)
setFlashVars(URL(_url).querystring());
+ // These flags are here so we can construct
+ // the correct URL for base url later.
+ // If the URL class was not immutable we could do something smarter...
+ bool hasOverriddenBaseUrl;
+ std::string overriddenBaseUrl;
+
// Parse parameters
StringNoCaseEqual noCaseCompare;
for ( std::map<std::string,std::string>::const_iterator it=params.begin(),
@@ -333,13 +339,15 @@
if ( noCaseCompare(it->first, "base") )
{
- setBaseUrl(it->second);
+ hasOverriddenBaseUrl=true;
+ overriddenBaseUrl=it->second;
continue;
}
}
// Set base url for this movie (needed before parsing)
- gnash::set_base_url(URL(_baseurl));
+ if ( hasOverriddenBaseUrl ) gnash::set_base_url(URL(overriddenBaseUrl,
URL(_baseurl)));
+ else gnash::set_base_url(URL(_baseurl));
// Load the actual movie.
_movieDef = load_movie();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/Player.cpp [gnash_0_8_3_branch],
Sandro Santilli <=