moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix disabling ssl causing errors

This commit is contained in:
calzoneman 2013-09-10 16:45:43 -05:00
parent a085ed83f2
commit aadba26891
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -1,3 +1,6 @@
Tue Sep 10 16:45 2013 CDT
* lib/channel.js: Don't attempt to emit to SSL sockets if it's disabled
Tue Sep 10 16:34 2013 CDT Tue Sep 10 16:34 2013 CDT
* www/channel.html, www/assets/js/jwplayer.js: Cache jwplayer script * www/channel.html, www/assets/js/jwplayer.js: Cache jwplayer script
locally since their server doesn't support SSL locally since their server doesn't support SSL

3
lib/channel.js
View File

@ -989,7 +989,8 @@ Channel.prototype.sendAll = function(message, data) {
if(this.name == "") if(this.name == "")
return; return;
this.server.io.sockets.in(this.name).emit(message, data); this.server.io.sockets.in(this.name).emit(message, data);
this.server.sslio.sockets.in(this.name).emit(message, data); if (this.server.cfg["enable-ssl"])
this.server.sslio.sockets.in(this.name).emit(message, data);
} }
Channel.prototype.sendAllWithPermission = function(perm, msg, data) { Channel.prototype.sendAllWithPermission = function(perm, msg, data) {