kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2411 from khassel/fix_cors

Browse Source 
fix socket.io cors errors
This commit is contained in:
Michael Teeuw 2021-01-10 10:13:16 +01:00 committed by GitHub
commit aa61874848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ _This release is scheduled to be released on 2021-04-01._
### Fixed ### Fixed
- Added default log levels to stop calendar log spamming. - Added default log levels to stop calendar log spamming.
- Fix socket.io cors errors, see [breaking change since socket.io v3](https://socket.io/docs/v3/handling-cors/)
## [2.14.0] - 2021-01-01 ## [2.14.0] - 2021-01-01

4
js/server.js
View File

@ -27,7 +27,9 @@ function Server(config, callback) {
} else { } else {
server = require("http").Server(app); server = require("http").Server(app);
} }
const io = require("socket.io")(server); const io = require("socket.io")(server, {
cors: {}
});
Log.log(`Starting server on port ${port} ... `); Log.log(`Starting server on port ${port} ... `);