[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aestes at apple.com
aestes at apple.com
Wed Dec 22 13:31:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 73d4c1dd4313e023933ecf4f1f1a27d3266bba0d
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 17 21:50:23 2010 +0000
2010-09-17 Andy Estes <aestes at apple.com>
Reviewed by Darin Adler.
<rdar://problem/8440903> WK2: REGRESSION (r66156): Web sites using
AppleConnect fail to log in: "HTTP Status 404 - /ssowebapp/scriptFrame"
https://bugs.webkit.org/show_bug.cgi?id=45960
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createPlugin):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e0b7683..a4d0a76 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-17 Andy Estes <aestes at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/8440903> WK2: REGRESSION (r66156): Web sites using
+ AppleConnect fail to log in: "HTTP Status 404 - /ssowebapp/scriptFrame"
+ https://bugs.webkit.org/show_bug.cgi?id=45960
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createPlugin):
+
2010-09-17 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index ff8dd78..ec65182 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -905,6 +905,8 @@ void WebFrameLoaderClient::didTransferChildFrameToNewDocument()
PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement* pluginElement, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
{
+ ASSERT(paramNames.size() == paramValues.size());
+
String pluginPath;
// FIXME: In the future, this should return a real CoreIPC connection to the plug-in host, but for now we just
@@ -928,6 +930,14 @@ PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugIn
parameters.values = paramValues;
parameters.mimeType = mimeType;
parameters.loadManually = loadManually;
+
+ // <rdar://problem/8440903>: AppleConnect has a bug where it does not
+ // understand the parameter names specified in the <object> element that
+ // embeds its plug-in. This hack works around the issue by converting the
+ // parameter names to lowercase before passing them to the plug-in.
+ if (equalIgnoringCase(mimeType, "application/x-snkp"))
+ for (size_t i = 0; i < paramNames.size(); ++i)
+ parameters.names[i] = paramNames[i].lower();
RefPtr<Plugin> plugin = NetscapePlugin::create(pluginModule.release());
return PluginView::create(pluginElement, plugin.release(), parameters);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list