diff options
| -rwxr-xr-x | common/bootstrap.js | 4 | ||||
| -rw-r--r-- | common/modules/protocol.jsm | 2 | ||||
| -rw-r--r-- | common/modules/services.jsm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/common/bootstrap.js b/common/bootstrap.js index ccf10076..d317e3aa 100755 --- a/common/bootstrap.js +++ b/common/bootstrap.js @@ -202,12 +202,12 @@ function init() { for (let [name] in Iterator(JSMLoader.globals)) Cu.unload(~name.indexOf(":") ? name : "resource://dactyl" + JSMLoader.suffix + "/" + name); } - else if (JSMLoader.bump != 5) // Temporary hack + else if (JSMLoader.bump != 6) // Temporary hack Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm", Cu.import(BOOTSTRAP_JSM, global)); } - if (!JSMLoader || JSMLoader.bump !== 5 || Cu.unload) + if (!JSMLoader || JSMLoader.bump !== 6 || Cu.unload) Cu.import(BOOTSTRAP_JSM, global); JSMLoader.bootstrap = this; diff --git a/common/modules/protocol.jsm b/common/modules/protocol.jsm index de4dbc1e..9c4a8d7b 100644 --- a/common/modules/protocol.jsm +++ b/common/modules/protocol.jsm @@ -84,7 +84,7 @@ ProtocolBase.prototype = { newURI: function newURI(spec, charset, baseURI) { if (baseURI && baseURI.host === "data") baseURI = null; - return services.URL(services.URL.URLTYPE_STANDARD, + return services.URL(services.URL.URLTYPE_AUTHORITY, this.defaultPort, spec, charset, baseURI); }, diff --git a/common/modules/services.jsm b/common/modules/services.jsm index 851b7e7c..b0d30e2b 100644 --- a/common/modules/services.jsm +++ b/common/modules/services.jsm @@ -81,7 +81,7 @@ var Services = Module("Services", { this.addClass("Pipe", "@mozilla.org/pipe;1", "nsIPipe", "init"); this.addClass("Process", "@mozilla.org/process/util;1", "nsIProcess", "init"); this.addClass("StreamChannel","@mozilla.org/network/input-stream-channel;1", - ["nsIChannel", "nsIInputStreamChannel", "nsIRequest"], "setURI"); + ["nsIInputStreamChannel", "nsIChannel"], "setURI"); this.addClass("StreamCopier", "@mozilla.org/network/async-stream-copier;1","nsIAsyncStreamCopier", "init"); this.addClass("String", "@mozilla.org/supports-string;1", "nsISupportsString", "data"); this.addClass("StringStream", "@mozilla.org/io/string-input-stream;1", "nsIStringInputStream", "data"); |