wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1087741: Make JS callers of ios.newChannel call ios.newChannel2 in services/ (r=rnewman,hskupin)

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2014-10-24 15:22:14 -07:00
parent 0b69ea4cff
commit 7d268b217e
5 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/common/rest.js
View File

@ -305,7 +305,12 @@ RESTRequest.prototype = {
} }
// Create and initialize HTTP channel. // Create and initialize HTTP channel.
let channel = Services.io.newChannelFromURI(this.uri, null, null) let channel = Services.io.newChannelFromURI2(this.uri,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIRequest) .QueryInterface(Ci.nsIRequest)
.QueryInterface(Ci.nsIHttpChannel); .QueryInterface(Ci.nsIHttpChannel);
this.channel = channel; this.channel = channel;

7
services/sync/Weave.js
View File

@ -180,7 +180,12 @@ AboutWeaveLog.prototype = {
newChannel: function(aURI) { newChannel: function(aURI) {
let dir = FileUtils.getDir("ProfD", ["weave", "logs"], true); let dir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
let uri = Services.io.newFileURI(dir); let uri = Services.io.newFileURI(dir);
let channel = Services.io.newChannelFromURI(uri); let channel = Services.io.newChannelFromURI2(uri,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
channel.originalURI = aURI; channel.originalURI = aURI;
// Ensure that the about page has the same privileges as a regular directory // Ensure that the about page has the same privileges as a regular directory

9
services/sync/modules/resource.js
View File

@ -146,7 +146,14 @@ AsyncResource.prototype = {
// to obtain a request channel. // to obtain a request channel.
// //
_createRequest: function Res__createRequest(method) { _createRequest: function Res__createRequest(method) {
let channel = Services.io.newChannel(this.spec, null, null) let channel = Services.io.newChannel2(this.spec,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Ci.nsIRequest) .QueryInterface(Ci.nsIRequest)
.QueryInterface(Ci.nsIHttpChannel); .QueryInterface(Ci.nsIHttpChannel);

10
services/sync/tests/unit/test_errorhandler_filelog.js
View File

@ -7,6 +7,7 @@ Cu.import("resource://services-sync/service.js");
Cu.import("resource://services-sync/util.js"); Cu.import("resource://services-sync/util.js");
Cu.import("resource://gre/modules/FileUtils.jsm"); Cu.import("resource://gre/modules/FileUtils.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm"); Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/Services.jsm");
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true); const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
const LOG_PREFIX_SUCCESS = "success-"; const LOG_PREFIX_SUCCESS = "success-";
@ -81,11 +82,16 @@ add_test(function test_logOnSuccess_false() {
}); });
function readFile(file, callback) { function readFile(file, callback) {
NetUtil.asyncFetch(file, function (inputStream, statusCode, request) { NetUtil.asyncFetch2(file, function (inputStream, statusCode, request) {
let data = NetUtil.readInputStreamToString(inputStream, let data = NetUtil.readInputStreamToString(inputStream,
inputStream.available()); inputStream.available());
callback(statusCode, data); callback(statusCode, data);
}); },
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
} }
add_test(function test_logOnSuccess_true() { add_test(function test_logOnSuccess_true() {

9
services/sync/tps/extensions/tps/resource/modules/addons.jsm
View File

@ -20,7 +20,14 @@ const STATE_ENABLED = 1;
const STATE_DISABLED = 2; const STATE_DISABLED = 2;
function GetFileAsText(file) { function GetFileAsText(file) {
let channel = Services.io.newChannel(file, null, null); let channel = Services.io.newChannel2(file,
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER);
let inputStream = channel.open(); let inputStream = channel.open();
if (channel instanceof Ci.nsIHttpChannel && if (channel instanceof Ci.nsIHttpChannel &&
channel.responseStatus != 200) { channel.responseStatus != 200) {