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

When doing text/plain sniffing, don't let the special MIME types we use for the

Browse Source 
purpose leak out of the URILoader/exthandler combination.  Bug 300027, r=biesi,
sr=darin, a=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@176002 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2005-07-13 16:48:01 +00:00
parent dacf274244
commit 945d5c061c
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mozilla/uriloader/base/nsURILoader.cpp
View File

@ -318,16 +318,39 @@ NS_IMETHODIMP nsDocumentOpenInfo::OnStartRequest(nsIRequest *request, nsISupport
if (contentEncoding.IsEmpty()) {
// OK, this is initial dispatch of an HTTP response and its Content-Type
// header is exactly "text/plain". We need to check whether this is
// really text....
LOG((" Possibly bogus text/plain; resetting type to " APPLICATION_MAYBE_TEXT));
httpChannel->SetContentType(NS_LITERAL_CSTRING(APPLICATION_MAYBE_TEXT));
// really text.... Note that some of our listeners will actually
// accept all types, including the APPLICATION_MAYBE_TEXT internal
// type, so we need to call ConvertData here manually instead of
// relying on DispatchContent to do it.
LOG((" Possibly bogus text/plain; trying to sniff for real type"));
rv = ConvertData(request, m_contentListener,
NS_LITERAL_CSTRING(APPLICATION_MAYBE_TEXT),
NS_LITERAL_CSTRING("*/*"));
if (NS_FAILED(rv)) {
// We failed to convert. Just go ahead and handle as the original
// type. If ConvertData happened to set our m_targetStreamListener,
// we don't want it!
m_targetStreamListener = nsnull;
}
else {
LOG((APPLICATION_MAYBE_TEXT " converter taking over now"));
}
}
}
}
rv = DispatchContent(request, aCtxt);
LOG((" After dispatch, m_targetStreamListener: 0x%p", m_targetStreamListener.get()));
// If we sniffed text/plain above, m_targetStreamListener may already be
// non-null.
if (!m_targetStreamListener) {
rv = DispatchContent(request, aCtxt);
}
LOG((" After dispatch, m_targetStreamListener: 0x%p, rv: 0x%08X", m_targetStreamListener.get(), rv));
NS_ASSERTION(NS_SUCCEEDED(rv) || !m_targetStreamListener,
"Must not have an m_targetStreamListener with a failure return!");
NS_ENSURE_SUCCESS(rv, rv);
if (m_targetStreamListener)
rv = m_targetStreamListener->OnStartRequest(request, aCtxt);
@ -394,6 +417,15 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
LOG((" Got type from channel: '%s'", mContentType.get()));
}
PRBool isGuessFromExt =
mContentType.LowerCaseEqualsASCII(APPLICATION_GUESS_FROM_EXT);
if (isGuessFromExt) {
// Reset to application/octet-stream for now; no one other than the
// external helper app service should see APPLICATION_GUESS_FROM_EXT.
mContentType = APPLICATION_OCTET_STREAM;
aChannel->SetContentType(NS_LITERAL_CSTRING(APPLICATION_OCTET_STREAM));
}
// Check whether the data should be forced to be handled externally. This
// could happen because the Content-Disposition header is set so, or, in the
// future, because the user has specified external handling for the MIME
@ -594,6 +626,11 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
request->SetLoadFlags(loadFlags | nsIChannel::LOAD_RETARGETED_DOCUMENT_URI
| nsIChannel::LOAD_TARGETED);
if (isGuessFromExt) {
mContentType = APPLICATION_GUESS_FROM_EXT;
aChannel->SetContentType(NS_LITERAL_CSTRING(APPLICATION_GUESS_FROM_EXT));
}
rv = helperAppService->DoContent(mContentType,
request,
m_originalContext,