/hg/release/icedtea6-1.7: Ported over regression fixes from HEAD.

[dbhole at icedtea.classpath.org]

changeset 3132bad1a11b in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=3132bad1a11b
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Jan 06 17:56:50 2010 -0500

	Ported over regression fixes from HEAD.


diffstat:

5 files changed, 18 insertions(+), 8 deletions(-)
ChangeLog                                                |   12 ++++++++++++
configure.ac                                             |    2 +-
plugin/icedtea/sun/applet/PluginAppletViewer.java        |    8 ++++----
plugin/icedteanp/IcedTeaNPPlugin.h                       |    2 --
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |    2 +-

diffs (94 lines):

diff -r a0f8cf8cf432 -r 3132bad1a11b ChangeLog
--- a/ChangeLog	Thu Dec 24 14:06:38 2009 -0500
+++ b/ChangeLog	Wed Jan 06 17:56:50 2010 -0500
@@ -1,3 +1,15 @@ 2009-12-24  Deepak Bhole <dbhole at redhat.
+2010-01-06  Deepak Bhole <dbhole at redhat.com>
+
+	* configure.ac: Use libxul instead of libxul-unstable for the new NP
+	plugin.
+	* plugin/icedteanp/IcedTeaNPPlugin.h: Remove debug specific line from 
+	code.
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java
+	(handleMessage): Decode URL before setting documentbase.
+	(parse): Port over parser fixes from NP plugin tree.
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+	(handleMessage): Decode URL before setting documentbase.
+
 2009-12-24  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am: Define XP_UNIX, without which critical plugin API 
diff -r a0f8cf8cf432 -r 3132bad1a11b configure.ac
--- a/configure.ac	Thu Dec 24 14:06:38 2009 -0500
+++ b/configure.ac	Wed Jan 06 17:56:50 2010 -0500
@@ -471,7 +471,7 @@ if test "x${enable_npplugin}" = "xyes"
 if test "x${enable_npplugin}" = "xyes"
   then
     PKG_CHECK_MODULES(MOZILLA, \
-      mozilla-plugin libxul-unstable)
+      mozilla-plugin libxul)
     PKG_CHECK_MODULES(GTK, gtk+-2.0)
     PKG_CHECK_MODULES(GLIB, glib-2.0)
 
diff -r a0f8cf8cf432 -r 3132bad1a11b plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Thu Dec 24 14:06:38 2009 -0500
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Wed Jan 06 17:56:50 2010 -0500
@@ -402,7 +402,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
         			 }
         			 int index = message.indexOf(' ', "tag".length() + 1);
         			 request.documentbase =
-        				 message.substring("tag".length() + 1, index);
+        				 UrlUtil.decode(message.substring("tag".length() + 1, index));
         			 request.tag = message.substring(index + 1);
         			 PluginDebug.debug ("REQUEST TAG: " + request.tag + " " +
         					 Thread.currentThread());
@@ -1788,7 +1788,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
     					 atts = scanTag(in);
 
                          // If there is a classid and no code tag present, transform it to code tag
-                         if (atts.get("code") == null && atts.get("classid") != null && ((String) atts.get("classid")).endsWith(".class")) {
+                         if (atts.get("code") == null && atts.get("classid") != null && !((String) atts.get("classid")).startsWith("clsid:")) {
                              atts.put("code", atts.get("classid"));
                          }
                          
@@ -1830,7 +1830,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
     				     }
 
     				     // If there is a classid and no code tag present, transform it to code tag
-    				     if (atts.get("code") == null && atts.get("classid") != null && ((String) atts.get("classid")).endsWith(".class")) {
+    				     if (atts.get("code") == null && atts.get("classid") != null && !((String) atts.get("classid")).startsWith("clsid:")) {
     				         atts.put("code", atts.get("classid"));
     				     }
                         
@@ -1888,7 +1888,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
     					 atts = scanTag(in);
 
                          // If there is a classid and no code tag present, transform it to code tag
-                         if (atts.get("code") == null && atts.get("classid") != null && ((String) atts.get("classid")).endsWith(".class")) {
+                         if (atts.get("code") == null && atts.get("classid") != null && !((String) atts.get("classid")).startsWith("clsid:")) {
                              atts.put("code", atts.get("classid"));
                          }
                          
diff -r a0f8cf8cf432 -r 3132bad1a11b plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h	Thu Dec 24 14:06:38 2009 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h	Wed Jan 06 17:56:50 2010 -0500
@@ -38,8 +38,6 @@ exception statement from your version. *
 
 #ifndef __ICEDTEANPPLUGIN_H__
 #define	__ICEDTEANPPLUGIN_H__
-
-#define MOZILLA_VERSION_COLLAPSED 1090105
 
 #if MOZILLA_VERSION_COLLAPSED < 1090100
 #include <nsThreadUtils.h>
diff -r a0f8cf8cf432 -r 3132bad1a11b plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Dec 24 14:06:38 2009 -0500
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Jan 06 17:56:50 2010 -0500
@@ -424,7 +424,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
         			 }
         			 int index = message.indexOf(' ', "tag".length() + 1);
         			 request.documentbase =
-        				 message.substring("tag".length() + 1, index);
+        				 UrlUtil.decode(message.substring("tag".length() + 1, index));
         			 request.tag = message.substring(index + 1);
         			 PluginDebug.debug ("REQUEST TAG: " + request.tag + " " +
         					 Thread.currentThread());