From 0287e46ab43d67a5f2497080752e5e0936937a01 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Tue, 16 May 2017 11:29:32 +0200 Subject: [PATCH] JSON schemas served with gzip fail to parse. Fixes #26672 --- extensions/json/server/npm-shrinkwrap.json | 20 ++++++++++---------- extensions/json/server/package.json | 2 +- extensions/json/server/src/jsonServerMain.ts | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/extensions/json/server/npm-shrinkwrap.json b/extensions/json/server/npm-shrinkwrap.json index b986bef9080..d199f7b2a0f 100644 --- a/extensions/json/server/npm-shrinkwrap.json +++ b/extensions/json/server/npm-shrinkwrap.json @@ -8,14 +8,14 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz" }, "debug": { - "version": "2.6.0", + "version": "2.6.6", "from": "debug@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz" + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz" }, "extend": { - "version": "3.0.0", + "version": "3.0.1", "from": "extend@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz" }, "http-proxy-agent": { "version": "0.2.7", @@ -33,14 +33,14 @@ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.4.2.tgz" }, "ms": { - "version": "0.7.2", - "from": "ms@0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" + "version": "0.7.3", + "from": "ms@0.7.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" }, "request-light": { - "version": "0.2.0", - "from": "request-light@0.2.0", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.0.tgz" + "version": "0.2.1", + "from": "request-light@0.2.1", + "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz" }, "vscode-json-languageservice": { "version": "2.0.9", diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index 33d3cd9c8a0..6c643c0f542 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "jsonc-parser": "^0.4.2", - "request-light": "^0.2.0", + "request-light": "^0.2.1", "vscode-json-languageservice": "^2.0.9", "vscode-languageserver": "^3.1.0-alpha.1", "vscode-nls": "^2.0.2" diff --git a/extensions/json/server/src/jsonServerMain.ts b/extensions/json/server/src/jsonServerMain.ts index 09a0dc199a7..f81721cde4a 100644 --- a/extensions/json/server/src/jsonServerMain.ts +++ b/extensions/json/server/src/jsonServerMain.ts @@ -111,7 +111,8 @@ let schemaRequestService = (uri: string): Thenable => { } }); } - return xhr({ url: uri, followRedirects: 5 }).then(response => { + let headers = { 'Accept-Encoding': 'gzip, deflate' }; + return xhr({ url: uri, followRedirects: 5, headers }).then(response => { return response.responseText; }, (error: XHRResponse) => { return Promise.reject(error.responseText || getErrorStatusDescription(error.status) || error.toString()); -- GitLab