Bug 1197918 - Use channel->Open2() in rdf/base/nsRDFXMLDataSource.cpp (r=sicking)
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Sat, 12 Sep 2015 12:58:49 -0700
changeset 294808 bdb5b24b1f4e39412022f62354e6de3911cb34eb
parent 294807 0516d4db29a9d76361dd51331036e0b059b4dd60
child 294809 f737c4a017525cb3522e1326e5b63e6ee13d94fb
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs1197918
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1197918 - Use channel->Open2() in rdf/base/nsRDFXMLDataSource.cpp (r=sicking)
rdf/base/nsRDFXMLDataSource.cpp
--- a/rdf/base/nsRDFXMLDataSource.cpp
+++ b/rdf/base/nsRDFXMLDataSource.cpp
@@ -478,22 +478,22 @@ RDFXMLDataSourceImpl::BlockingParse(nsIU
     
     nsCOMPtr<nsIChannel> channel;
     nsCOMPtr<nsIRequest> request;
 
     // Null LoadGroup ?
     rv = NS_NewChannel(getter_AddRefs(channel),
                        aURL,
                        nsContentUtils::GetSystemPrincipal(),
-                       nsILoadInfo::SEC_NORMAL,
+                       nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                        nsIContentPolicy::TYPE_OTHER);
 
     if (NS_FAILED(rv)) return rv;
     nsCOMPtr<nsIInputStream> in;
-    rv = channel->Open(getter_AddRefs(in));
+    rv = channel->Open2(getter_AddRefs(in));
 
     // Report success if the file doesn't exist, but propagate other errors.
     if (rv == NS_ERROR_FILE_NOT_FOUND) return NS_OK;
     if (NS_FAILED(rv)) return rv;
 
     if (! in) {
         NS_ERROR("no input stream");
         return NS_ERROR_FAILURE;