[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

cblu cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:04:35 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 3b5189330c2b473784234a213e9471724fc9ebc4
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 24 21:05:20 2003 +0000

    	Fixed: <rdar://problem/3424039>: standalone plug-in content occasionaly redirects to blank page
    
            Reviewed by john.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]): don't honor JS requests from standalone plug-ins to workaround 3462628 which is a deeper issue.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d731d0f..3130506 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,13 @@
 2003-10-24  Chris Blumenberg  <cblu at apple.com>
+	
+	Fixed: <rdar://problem/3424039>: standalone plug-in content occasionaly redirects to blank page
+
+        Reviewed by john.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]): don't honor JS requests from standalone plug-ins to workaround 3462628 which is a deeper issue.
+
+2003-10-24  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3462256>: REGRESSION: Plain text is downloaded
 
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index e986cfc..f1ae0d2 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1312,6 +1312,11 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
     }
     
     NSString *JSString = [URL _web_scriptIfJavaScriptURL];
+    if (JSString != nil && cTarget == NULL && mode == NP_FULL) {
+        // Don't allow a JavaScript request from a standalone plug-in that is self-targetted
+        // because this can cause the user to be redirected to a blank page (3424039).
+        return NPERR_INVALID_URL;
+    }
     
     if (cTarget || JSString) {
         // Make when targetting a frame or evaluating a JS string, perform the request after a delay because we don't

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list