summaryrefslogtreecommitdiffstats
path: root/uriloader/base/nsURILoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'uriloader/base/nsURILoader.cpp')
-rw-r--r--uriloader/base/nsURILoader.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp
index 69475d68f..5a6b38028 100644
--- a/uriloader/base/nsURILoader.cpp
+++ b/uriloader/base/nsURILoader.cpp
@@ -385,16 +385,6 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
bool allowContentDispositionToForceExternalHandling = true;
-#ifdef MOZ_B2G
-
- // On B2G, OMA content files should never be handled by an external handler
- // (even if the server specifies Content-Disposition: attachment) because the
- // data should never be stored on an unencrypted form.
- allowContentDispositionToForceExternalHandling =
- !mContentType.LowerCaseEqualsASCII("application/vnd.oma.drm.message");
-
-#endif
-
if (NS_SUCCEEDED(rv) && (disposition == nsIChannel::DISPOSITION_ATTACHMENT) &&
allowContentDispositionToForceExternalHandling) {
forceExternalHandling = true;
@@ -834,7 +824,7 @@ NS_IMETHODIMP nsURILoader::OpenURI(nsIChannel *channel,
// the preferred protocol handler.
// But for now, I'm going to let necko do the work for us....
- rv = channel->AsyncOpen(loader, nullptr);
+ rv = channel->AsyncOpen2(loader);
// no content from this load - that's OK.
if (rv == NS_ERROR_NO_CONTENT) {