suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fx60 compatibility: Update nsIInputStreamPump init() calls

Browse Source
This commit is contained in:
Dan Stillman 2018-02-24 05:04:04 -05:00
parent c2b77890c3
commit b2fd9fece7
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chrome/content/zotero/xpcom/ipc.js
View File

@ -461,7 +461,12 @@ Zotero.IPC.Pipe.DeferredOpen.prototype = {
var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"]. var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"].
createInstance(Components.interfaces.nsIInputStreamPump); createInstance(Components.interfaces.nsIInputStreamPump);
try {
pump.init(fifoStream, 0, 0, true);
}
catch (e) {
pump.init(fifoStream, -1, -1, 4096, 1, true); pump.init(fifoStream, -1, -1, 4096, 1, true);
}
pump.asyncRead(this, null); pump.asyncRead(this, null);
this._openTime = Date.now(); this._openTime = Date.now();

5
chrome/content/zotero/xpcom/server.js
View File

@ -136,7 +136,12 @@ Zotero.Server.SocketListener = new function() {
var dataListener = new Zotero.Server.DataListener(iStream, oStream); var dataListener = new Zotero.Server.DataListener(iStream, oStream);
var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"] var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"]
.createInstance(Components.interfaces.nsIInputStreamPump); .createInstance(Components.interfaces.nsIInputStreamPump);
try {
pump.init(iStream, 0, 0, false);
}
catch (e) {
pump.init(iStream, -1, -1, 0, 0, false); pump.init(iStream, -1, -1, 0, 0, false);
}
pump.asyncRead(dataListener, null); pump.asyncRead(dataListener, null);
} }

10
chrome/content/zotero/xpcom/utilities_internal.js
View File

@ -254,7 +254,12 @@ Zotero.Utilities.Internal = {
// Send input stream to stream converter // Send input stream to stream converter
var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"] var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"]
.createInstance(Components.interfaces.nsIInputStreamPump); .createInstance(Components.interfaces.nsIInputStreamPump);
try {
pump.init(is, 0, 0, true);
}
catch (e) {
pump.init(is, -1, -1, 0, 0, true); pump.init(is, -1, -1, 0, 0, true);
}
pump.asyncRead(converter, null); pump.asyncRead(converter, null);
return deferred.promise; return deferred.promise;
@ -314,7 +319,12 @@ Zotero.Utilities.Internal = {
// Send input stream to stream converter // Send input stream to stream converter
var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"] var pump = Components.classes["@mozilla.org/network/input-stream-pump;1"]
.createInstance(Components.interfaces.nsIInputStreamPump); .createInstance(Components.interfaces.nsIInputStreamPump);
try {
pump.init(bis, 0, 0, true);
}
catch (e) {
pump.init(bis, -1, -1, 0, 0, true); pump.init(bis, -1, -1, 0, 0, true);
}
pump.asyncRead(converter, null); pump.asyncRead(converter, null);
return deferred.promise; return deferred.promise;

5
components/zotero-protocol-handler.js
View File

@ -1221,7 +1221,12 @@ AsyncChannel.prototype = {
//Zotero.debug("AsyncChannel: Got input stream from generator"); //Zotero.debug("AsyncChannel: Got input stream from generator");
var pump = Cc["@mozilla.org/network/input-stream-pump;1"].createInstance(Ci.nsIInputStreamPump); var pump = Cc["@mozilla.org/network/input-stream-pump;1"].createInstance(Ci.nsIInputStreamPump);
try {
pump.init(data, 0, 0, true);
}
catch (e) {
pump.init(data, -1, -1, 0, 0, true); pump.init(data, -1, -1, 0, 0, true);
}
pump.asyncRead(listenerWrapper, context); pump.asyncRead(listenerWrapper, context);
} }
else if (data instanceof Ci.nsIFile || data instanceof Ci.nsIURI) { else if (data instanceof Ci.nsIFile || data instanceof Ci.nsIURI) {