Merge pull request socketio#353 from dget/master

Fix connections between http/https in IE
felixge · Dec 21, 2011 · 201a0eb · 201a0eb
2 parents 13a8796 + 0ba168c
commit 201a0eb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/transports/xhr.js b/lib/transports/xhr.js
@@ -187,7 +187,10 @@
 
   XHR.check = function (socket, xdomain) {
     try {
-      if (io.util.request(xdomain)) {
+      var request = io.util.request(xdomain);
+      var socket_protocol = socket.options.secure ? 'https' : http;
+      var global_protocol = global.location.protocol.split(':')[0];
+      if (request && !(global.XDomainRequest && request instanceof XDomainRequest && socket_protocol != global_protocol)  ) {
         return true;
       }
     } catch(e) {}