[Gnash-commit] [SCM] Gnash branch, master, updated. edd301e11fb69996a8926933de73add32cae53db

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  edd301e11fb69996a8926933de73add32cae53db (commit)
       via  85b561b4adb19aed744af65fbdfac23b863ea1a7 (commit)
       via  a939737203895b7420d85094c93b226e97bf56bb (commit)
       via  bd51dca7256b211f71008df0c83d6c0159560ee7 (commit)
      from  842fe5cd6002d411606941af23bc17ad9e6c8da7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=edd301e11fb69996a8926933de73add32cae53db


commit edd301e11fb69996a8926933de73add32cae53db
Merge: 85b561b 842fe5c
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 30 20:38:43 2010 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=85b561b4adb19aed744af65fbdfac23b863ea1a7


commit 85b561b4adb19aed744af65fbdfac23b863ea1a7
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 30 20:38:10 2010 +0200

    Add info about the installation dir (must match with what's used as <base> 
tag

diff --git a/plugin/test/baseuri/README b/plugin/test/baseuri/README
index 99a8927..857de96 100644
--- a/plugin/test/baseuri/README
+++ b/plugin/test/baseuri/README
@@ -2,10 +2,15 @@ These files are a test for resolution of relative urls
 with different mixes of <base> tags and "base" params
 and subdir layouts.
 
-The test is not automated, but if you build test.swf in both
-root and sub/ dirs (top line of test.as contains makeswf call)
-you'll have instructions about what to expect written in the
-html page.
+The test is not automated.
+You have to build test.swf in both root and sub/ dirs
+(top line of test.as contains makeswf call) and install
+this directory content under a 'test' directory in your
+base root (or change installation in test_base.html top
+lines).
+Pointing your browser to the test.html file will show
+instructions on how to tell if the player is working as
+expected or not.
 
 As a facility, some javascript code shows what's the supposed
 baseURI to use for resolving relative urls.

http://git.savannah.gnu.org/cgit//commit/?id=a939737203895b7420d85094c93b226e97bf56bb


commit a939737203895b7420d85094c93b226e97bf56bb
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 30 20:35:42 2010 +0200

    "base" parameter is always to be considered a directory. All cases in 
plugin/test/baseuri/ succeed now

diff --git a/gui/Player.cpp b/gui/Player.cpp
index b9eb163..0de857c 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -293,9 +293,12 @@ Player::run(int argc, char* argv[], const std::string& 
infile,
 
     // Parse player parameters. These are not passed to the SWF, but rather
     // control stage properties etc.
+    // NOTE: it is intentional to force a trailing slash to "base" argument
+    //       as it was tested that the "base" argument is always considered
+    //       a directory!
     Params::const_iterator it = _params.find("base");
     const URL baseURL = (it == _params.end()) ? _baseurl :
-                                               URL(it->second, _baseurl);
+                                               URL(it->second+"/", _baseurl);
     /// The RunResources should be populated before parsing.
     _runResources.reset(new RunResources());
 

http://git.savannah.gnu.org/cgit//commit/?id=bd51dca7256b211f71008df0c83d6c0159560ee7


commit bd51dca7256b211f71008df0c83d6c0159560ee7
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 30 20:18:21 2010 +0200

    Test that "base" parameter is always taken as a directory, never a file!

diff --git a/plugin/test/baseuri/test.html b/plugin/test/baseuri/test.html
index 79ff7f4..7612d59 100644
--- a/plugin/test/baseuri/test.html
+++ b/plugin/test/baseuri/test.html
@@ -25,6 +25,24 @@ src="test.swf" base="sub" (expect XML:sub)
 
 <embed type="application/x-shockwave-flash"
  border="1"
+ src="test.swf"
+ height="100" width="400"
+ base="sub/">
+src="test.swf" base="sub/" (expect XML:sub)
+
+<hr/>
+
+<embed type="application/x-shockwave-flash"
+ border="1"
+ src="test.swf"
+ height="100" width="400"
+ base="sub/nonex">
+src="test.swf" base="sub/nonex" (expect Loaded:false)
+
+<hr/>
+
+<embed type="application/x-shockwave-flash"
+ border="1"
  src="sub/test.swf"
  height="100" width="400">
 src="sub/test.swf" no base (expect XML:root)

-----------------------------------------------------------------------

Summary of changes:
 gui/Player.cpp                |    5 ++++-
 plugin/test/baseuri/README    |   13 +++++++++----
 plugin/test/baseuri/test.html |   18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash