github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:meteor/meteor

Browse Source
This commit is contained in:
David Greenspan
2012-03-08 10:17:24 -08:00
parent 97d17379b3 df8460130f
commit b3310fcc3c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/stream/stream_client.js
View File

@@ -239,7 +239,12 @@ _.extend(Meteor._Stream.prototype, {
var self = this;
self._cleanup_socket(); // cleanup the old socket, if there was one.
self.socket = new SockJS(self.url, undefined, {debug: false});
self.socket = new SockJS(self.url, undefined, {
debug: false, protocols_whitelist: [
// only allow polling protocols. no websockets or streaming.
// streaming makes safari spin, and websockets hurt chrome.
'xdr-polling', 'xhr-polling', 'iframe-xhr-polling', 'jsonp-polling'
]});
self.socket.onmessage = function (data) {
// first message we get when we're connecting goes to _connected,
// which connects us. All subsequent messages (while connected) go to