From 6601e94db7876e0eb2aba9ea2e01fde92615d1c1 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 30 Apr 2019 23:33:59 +0200 Subject: [PATCH 1/2] [misc] bump socket.io to 0.9.19 for node7+ support Signed-off-by: Jakob Ackermann --- services/real-time/npm-shrinkwrap.json | 6 +++--- services/real-time/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/real-time/npm-shrinkwrap.json b/services/real-time/npm-shrinkwrap.json index 95656f81fd..a341bea726 100644 --- a/services/real-time/npm-shrinkwrap.json +++ b/services/real-time/npm-shrinkwrap.json @@ -1560,9 +1560,9 @@ "dev": true }, "socket.io": { - "version": "0.9.16", - "from": "socket.io@0.9.16", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", + "version": "0.9.19", + "from": "socket.io@0.9.19", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.19.tgz", "dependencies": { "redis": { "version": "0.7.3", diff --git a/services/real-time/package.json b/services/real-time/package.json index 60a978f3b5..e1e4573696 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -34,7 +34,7 @@ "request": "^2.88.0", "session.socket.io": "^0.1.6", "settings-sharelatex": "^1.1.0", - "socket.io": "0.9.16", + "socket.io": "^0.9.19", "socket.io-client": "^0.9.16" }, "devDependencies": { From 79a314d5fd5f8b6a6b3a69371d543496f458b78a Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 1 May 2019 00:56:32 +0200 Subject: [PATCH 2/2] [misc] disable the flash transport We do not use flash on the website and the policy file provider is not compatible with node7+. Signed-off-by: Jakob Ackermann --- services/real-time/app.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/real-time/app.coffee b/services/real-time/app.coffee index 6161e63a46..5c10bdb36f 100644 --- a/services/real-time/app.coffee +++ b/services/real-time/app.coffee @@ -45,7 +45,7 @@ io.configure -> # gzip uses a Node 0.8.x method of calling the gzip program which # doesn't work with 0.6.x #io.enable('browser client gzip') - io.set('transports', ['websocket', 'flashsocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']) + io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']) io.set('log level', 1) app.get "/", (req, res, next) ->