Skip to content

Properly formats disconnectSync URI and sends it #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rauchg merged 1 commit into from
Jul 20, 2012
Merged

Properly formats disconnectSync URI and sends it #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
for (var i = 0, transport; transport = transports[i]; i++) {
if (io.Transport[transport]
&& io.Transport[transport].check(this)
&& (!this.isXDomain() || io.Transport[transport].xdomainCheck())) {
&& (!this.isXDomain() || io.Transport[transport].xdomainCheck(this))) {
return new io.Transport[transport](this, this.sessionid);
}
}
Expand Down Expand Up @@ -359,10 +359,17 @@

Socket.prototype.disconnectSync = function () {
// ensure disconnection
var xhr = io.util.request()
, uri = this.resource + '/' + io.protocol + '/' + this.sessionid;

var xhr = io.util.request();
var uri = [
'http' + (this.options.secure ? 's' : '') + ':/'
, this.options.host + ':' + this.options.port
, this.options.resource
, io.protocol
, this.sessionid
].join('/');

xhr.open('GET', uri, true);
xhr.send(null);

// handle disconnection immediately
this.onDisconnect('booted');
Expand Down
4 changes: 2 additions & 2 deletions lib/transports/htmlfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@
* @api public
*/

HTMLFile.check = function () {
HTMLFile.check = function (socket) {
if (typeof window != "undefined" && 'ActiveXObject' in window){
try {
var a = new ActiveXObject('htmlfile');
return a && io.Transport.XHR.check();
return a && io.Transport.XHR.check(socket);
} catch(e){}
}
return false;
Expand Down
4 changes: 2 additions & 2 deletions lib/transports/xhr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@
* @api public
*/

XHR.xdomainCheck = function () {
return XHR.check(null, true);
XHR.xdomainCheck = function (socket) {
return XHR.check(socket, true);
};

})(
Expand Down