mozilla-central: changeset 260621:3104feff953c3474df3cf63657f0ae74d2855e0d

author	Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
	Wed, 02 Sep 2015 11:38:28 -0700
changeset 260621	3104feff953c3474df3cf63657f0ae74d2855e0d
parent 260620	582749996e7ccaa6469ce088492fa86cc9fb69d5
child 260622	1dbf8850f7ed7a3181a09ec1adeda7c4716ccb6c
push id	29318
push user	cbook@mozilla.com
push date	Thu, 03 Sep 2015 11:15:07 +0000
treeherder	mozilla-central@74fbd245369c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sicking
bugs	1197926
milestone	43.0a1
first release with	nightly linux32 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly linux64 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly mac 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly win32 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly win64 7f987c38bd3e / 43.0a1 / 20150904030227 / files
last release without	nightly linux32 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly linux64 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly mac fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly win32 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly win64 fb720c90eb49 / 43.0a1 / 20150902030229 / files

--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -255,21 +255,21 @@ nsresult nsReadConfig::openAndEvaluateJS
         nsCOMPtr<nsIURI> uri;
         rv = NS_NewURI(getter_AddRefs(uri), location);
         NS_ENSURE_SUCCESS(rv, rv);
 
         nsCOMPtr<nsIChannel> channel;
         rv = NS_NewChannel(getter_AddRefs(channel),
                            uri,
                            nsContentUtils::GetSystemPrincipal(),
-                           nsILoadInfo::SEC_NORMAL,
+                           nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                            nsIContentPolicy::TYPE_OTHER);
         NS_ENSURE_SUCCESS(rv, rv);
 
-        rv = channel->Open(getter_AddRefs(inStr));
+        rv = channel->Open2(getter_AddRefs(inStr));
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
     uint64_t fs64;
     uint32_t amt = 0;
     rv = inStr->Available(&fs64);
     if (NS_FAILED(rv))
         return rv;