Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 395110. Give type attribute higher priority when deciding what plugin to use. r=jonas@sicking.cc, sr=bzbarsky@mit.edu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@248034 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.org
2008-03-18 00:36:14 +00:00
parent f0ec91aac2
commit b4be13929b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/base/src/nsObjectLoadingContent.cpp
View File

@@ -387,15 +387,25 @@ nsObjectLoadingContent::OnStartRequest(nsIRequest *aRequest, nsISupports *aConte
channelType = APPLICATION_OCTET_STREAM;
chan->SetContentType(channelType);
}
if (mContentType.IsEmpty() ||
!channelType.EqualsASCII(APPLICATION_OCTET_STREAM)) {
mContentType = channelType;
} else {
// We want to use the channel type unless one of the following is
// true:
//
// 1) The channel type is application/octet-stream and we have a
// type hint
// 2) Our type hint is a type that we support with a plugin.
if ((channelType.EqualsASCII(APPLICATION_OCTET_STREAM) &&
!mContentType.IsEmpty()) ||
(IsSupportedPlugin(mContentType) &&
GetTypeOfContent(mContentType) == eType_Plugin)) {
// Set the type we'll use for dispatch on the channel. Otherwise we could
// end up trying to dispatch to a nsFrameLoader, which will complain that
// it couldn't find a way to handle application/octet-stream
chan->SetContentType(mContentType);
} else {
mContentType = channelType;
}
// Now find out what type the content is