From e7c5f0c53673d0ae1ef473bafab7a32365535fc2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Marynissen Date: Tue, 15 Oct 2019 09:20:00 +0200 Subject: [PATCH 1/2] Fix #3495 --- lib/socket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/socket.js b/lib/socket.js index 9a96929728..4e97eb55dd 100644 --- a/lib/socket.js +++ b/lib/socket.js @@ -116,7 +116,7 @@ Socket.prototype.buildHandshake = function(query){ function buildQuery(){ var requestQuery = url.parse(self.request.url, true).query; //if socket-specific query exist, replace query strings in requestQuery - return Object.assign({}, query, requestQuery); + return Object.assign({}, requestQuery, query); } return { headers: this.request.headers, From 0b47688a6dbf16e01061e1c5a4a472f58efefae4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Marynissen Date: Tue, 15 Oct 2019 09:26:56 +0200 Subject: [PATCH 2/2] Semver patch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d648fec14..15bdd27f33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "socket.io", - "version": "2.3.0", + "version": "2.3.1", "description": "node.js realtime framework server", "keywords": [ "realtime",