Merge 2f0cc0f into 3fed0bc

karma-runner · Dec 15, 2020 · a4498cd · a4498cd
2 parents 3fed0bc + 2f0cc0f
commit a4498cd
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 276 deletions.
diff --git a/lib/server.js b/lib/server.js
@@ -36,13 +36,13 @@ const EmitterWrapper = require('./emitter_wrapper')
 const processWrapper = new EmitterWrapper(process)
 
 function createSocketIoServer (webServer, executor, config) {
-  const server = new SocketIO(webServer, {
+  const server = new SocketIO.Server(webServer, {
     // avoid destroying http upgrades from socket.io to get proxied websockets working
     destroyUpgrade: false,
     path: config.urlRoot + 'socket.io/',
     transports: config.transports,
     forceJSONP: config.forceJSONP,
-    // Default is 5000 in socket.io v2.x.
+    // Default is 5000 in socket.io v2.x and v3.x.
     pingTimeout: config.pingTimeout || 5000
   })