ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-24 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

Browse Source 
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
This commit is contained in:
Anthony Dresser
2019-12-04 19:28:22 -08:00
committed by GitHub
parent a8818ab0df
commit f5ce7fb2a5
1507 changed files with 42813 additions and 27370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/platform/request/node/proxy.ts
View File

@@ -39,12 +39,12 @@ export async function getProxyAgent(rawRequestURL: string, options: IOptions = {
const opts = {
host: proxyEndpoint.hostname || '',
port: Number(proxyEndpoint.port),
port: proxyEndpoint.port || (proxyEndpoint.protocol === 'https' ? '443' : '80'),
auth: proxyEndpoint.auth,
rejectUnauthorized: isBoolean(options.strictSSL) ? options.strictSSL : true
rejectUnauthorized: isBoolean(options.strictSSL) ? options.strictSSL : true,
};
return requestURL.protocol === 'http:'
? new (await import('http-proxy-agent'))(opts)
? new (await import('http-proxy-agent'))(opts as any as Url)
: new (await import('https-proxy-agent'))(opts);
}

10
src/vs/platform/request/node/requestService.ts
View File

@@ -5,7 +5,7 @@
import * as https from 'https';
import * as http from 'http';
import { Stream } from 'stream';
import * as streams from 'vs/base/common/stream';
import { createGunzip } from 'zlib';
import { parse as parseUrl } from 'url';
import { Disposable } from 'vs/base/common/lifecycle';
@@ -18,7 +18,7 @@ import { IRequestOptions, IRequestContext } from 'vs/base/parts/request/common/r
import { getProxyAgent, Agent } from 'vs/platform/request/node/proxy';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ILogService } from 'vs/platform/log/common/log';
import { toVSBufferReadableStream } from 'vs/base/common/buffer';
import { streamToBufferReadableStream } from 'vs/base/common/buffer';
export interface IRawRequestFunction {
(options: http.RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
@@ -112,13 +112,13 @@ export class RequestService extends Disposable implements IRequestService {
followRedirects: followRedirects - 1
}), token).then(c, e);
} else {
let stream: Stream = res;
let stream: streams.ReadableStream<Uint8Array> = res;
if (res.headers['content-encoding'] === 'gzip') {
stream = stream.pipe(createGunzip());
stream = res.pipe(createGunzip());
}
c({ res, stream: toVSBufferReadableStream(stream) } as IRequestContext);
c({ res, stream: streamToBufferReadableStream(stream) } as IRequestContext);
}
});