From d43d4fbff0c0a3b59008e1dd5bc424c873d8ed94 Mon Sep 17 00:00:00 2001 From: "bbaetz%student.usyd.edu.au" Date: Mon, 18 Feb 2002 03:53:08 +0000 Subject: [PATCH] Bug 109600 - PAC script breaks chatzilla Bug 71565 - socks proxy doesn't work with chatzilla Chatzilla's urls need to be standardurls, not simpleuris r=rginda, chatzilla only --- extensions/irc/js/lib/chatzilla-service.js | 12 +++++++----- extensions/irc/js/lib/connection-xpcom.js | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/extensions/irc/js/lib/chatzilla-service.js b/extensions/irc/js/lib/chatzilla-service.js index b76caf0a07a..6c03f53c402 100644 --- a/extensions/irc/js/lib/chatzilla-service.js +++ b/extensions/irc/js/lib/chatzilla-service.js @@ -50,8 +50,8 @@ const IRCPROT_HANDLER_CID = /* components used in this file */ const MEDIATOR_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=window-mediator"; -const SIMPLEURI_CONTRACTID = - "@mozilla.org/network/simple-uri;1"; +const STANDARDURL_CONTRACTID = + "@mozilla.org/network/standard-url;1"; const ASS_CONTRACTID = "@mozilla.org/appshell/appShellService;1"; @@ -62,6 +62,7 @@ const nsICategoryManager = Components.interfaces.nsICategoryManager; const nsIContentHandler = Components.interfaces.nsIContentHandler; const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler; const nsIURI = Components.interfaces.nsIURI; +const nsIStandardURL = Components.interfaces.nsIStandardURL; const nsIChannel = Components.interfaces.nsIChannel; const nsIRequest = Components.interfaces.nsIRequest; const nsIAppShellService = Components.interfaces.nsIAppShellService; @@ -182,10 +183,11 @@ function (aSpec, aBaseURI) return null; } - var uri = Components.classes[SIMPLEURI_CONTRACTID].createInstance(nsIURI); - uri.spec = aSpec; + var url = Components.classes[STANDARDURL_CONTRACTID]. + createInstance(nsIStandardURL); + url.init(nsIStandardURL.URLTYPE_STANDARD, 6667, aSpec, aBaseURI); - return uri; + return url.QueryInterface(nsIURI); } IRCProtocolHandler.prototype.newChannel = diff --git a/extensions/irc/js/lib/connection-xpcom.js b/extensions/irc/js/lib/connection-xpcom.js index ea73d7ad49f..eb3e623dc75 100644 --- a/extensions/irc/js/lib/connection-xpcom.js +++ b/extensions/irc/js/lib/connection-xpcom.js @@ -87,10 +87,10 @@ function bc_connect(host, port, bind, tcp_flag, observer) if (!pps) throw ("Couldn't get protocol proxy service"); - var uri = Components.classes["@mozilla.org/network/simple-uri;1"]. - createInstance(Components.interfaces.nsIURI); - uri.spec = "irc:" + host + ':' + port; - + var ios = Components.classes["@mozilla.org/network/io-service;1"]. + getService(Components.interfaces.nsIIOService); + var spec = "irc://" + host + ':' + port; + var uri = ios.newURI(spec,null); var info = pps.examineForProxy(uri); this._transport = this._sockService.createTransport (host, port, info,