Mercurial > hg > release > icedtea6-1.11

changeset 1900:789ddfe105c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 08 Jan 2010 18:31:58 +0000
parents 3a66a0c37780 (current diff) 175b5c7ee4c7 (diff)
children 2c1898b9904e
files ChangeLog configure.ac
diffstat 5 files changed, 23 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 08 18:30:40 2010 +0000
+++ b/ChangeLog	Fri Jan 08 18:31:58 2010 +0000
@@ -1,17 +1,32 @@
-2010-01-05  Andrew John Hughes  <ahughes@redhat.com>
+2010-01-08  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/icedtea-jdk-docs-target.patch:
 	Dropped, refined version applied upstream.
 	* Makefile.am:
 	Remove above patch.
 	
+2010-01-06  Deepak Bhole <dbhole@redhat.com>
+
+	* plugin/icedteanp/IcedTeaNPPlugin.h: Remove debug specific line from 
+	code.
+
 2010-01-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Store path to rt-closed.jar in ICEDTEA_PLUGS
 	variable and reference on the classpath when
 	building extra-class-files.stamp.
-	
+
+2010-01-05  Deepak Bhole <dbhole@redhat.com>
+
+	* configure.ac: Use libxul instead of libxul-unstable for the new NP
+	plugin.
+	* 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.
+
 2010-01-05  Gary Benson  <gbenson@redhat.com>
 
 	* patches/zero/6909153.patch: New file.
--- a/configure.ac	Fri Jan 08 18:30:40 2010 +0000
+++ b/configure.ac	Fri Jan 08 18:31:58 2010 +0000
@@ -479,7 +479,7 @@
 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)
 
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Fri Jan 08 18:30:40 2010 +0000
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Fri Jan 08 18:31:58 2010 +0000
@@ -402,7 +402,7 @@
         			 }
         			 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 @@
     					 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 @@
     				     }
 
     				     // 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 @@
     					 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"));
                          }
                          
--- a/plugin/icedteanp/IcedTeaNPPlugin.h	Fri Jan 08 18:30:40 2010 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h	Fri Jan 08 18:31:58 2010 +0000
@@ -39,8 +39,6 @@
 #ifndef __ICEDTEANPPLUGIN_H__
 #define	__ICEDTEANPPLUGIN_H__
 
-#define MOZILLA_VERSION_COLLAPSED 1090105
-
 #if MOZILLA_VERSION_COLLAPSED < 1090100
 #include <nsThreadUtils.h>
 #else
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Fri Jan 08 18:30:40 2010 +0000
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Fri Jan 08 18:31:58 2010 +0000
@@ -424,7 +424,7 @@
         			 }
         			 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());