From 2b5cfcfb05749df78def6c4fa75da0ec2f334f96 Mon Sep 17 00:00:00 2001 From: Frank Schulz Date: Wed, 21 Mar 2018 12:37:33 +0100 Subject: [PATCH 1/2] Fix https type --- types/node/index.d.ts | 1 + types/node/v4/index.d.ts | 4 +++- types/node/v6/index.d.ts | 4 +++- types/node/v7/index.d.ts | 4 +++- types/node/v8/index.d.ts | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/types/node/index.d.ts b/types/node/index.d.ts index b2e310cffa..edad483995 100644 --- a/types/node/index.d.ts +++ b/types/node/index.d.ts @@ -1768,6 +1768,7 @@ declare module "https" { export class Agent extends http.Agent { constructor(options?: AgentOptions); + options: AgentOptions; } export class Server extends tls.Server { diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts index 09cbd8bb43..16e54d002d 100644 --- a/types/node/v4/index.d.ts +++ b/types/node/v4/index.d.ts @@ -1081,7 +1081,9 @@ declare module "https" { secureProtocol?: string; } - export interface Agent extends http.Agent { } + export interface Agent extends http.Agent { + options?: AgentOptions; + } export interface AgentOptions extends http.AgentOptions { pfx?: any; diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index 152507c3a8..3ca66a2df5 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -1468,7 +1468,9 @@ declare module "https" { secureProtocol?: string; } - export interface Agent extends http.Agent { } + export interface Agent extends http.Agent { + options?: AgentOptions; + } export interface AgentOptions extends http.AgentOptions { pfx?: any; diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts index bdcb47d2e1..748f932d80 100644 --- a/types/node/v7/index.d.ts +++ b/types/node/v7/index.d.ts @@ -1528,7 +1528,9 @@ declare module "https" { secureProtocol?: string; } - export interface Agent extends http.Agent { } + export interface Agent extends http.Agent { + options?: AgentOptions; + } export interface AgentOptions extends http.AgentOptions { pfx?: any; diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts index f28c0959a4..bbad9e0d66 100644 --- a/types/node/v8/index.d.ts +++ b/types/node/v8/index.d.ts @@ -1757,6 +1757,7 @@ declare module "https" { export class Agent extends http.Agent { constructor(options?: AgentOptions); + options: AgentOptions; } export class Server extends tls.Server { From a36a10b2bfc04f368f88d815c7ee21ac3dc8d785 Mon Sep 17 00:00:00 2001 From: Frank Schulz Date: Wed, 21 Mar 2018 12:53:58 +0100 Subject: [PATCH 2/2] Add tests --- types/node/node-tests.ts | 2 ++ types/node/v4/node-tests.ts | 2 ++ types/node/v6/node-tests.ts | 2 ++ types/node/v7/node-tests.ts | 2 ++ types/node/v8/node-tests.ts | 2 ++ 5 files changed, 10 insertions(+) diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts index 1eb6539b09..c3fbb75953 100644 --- a/types/node/node-tests.ts +++ b/types/node/node-tests.ts @@ -1497,6 +1497,8 @@ namespace https_tests { https.request('http://www.example.com/xyz'); + https.globalAgent.options.ca = []; + { const server = new https.Server(); diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts index e60b578ccf..2b3be03f8d 100644 --- a/types/node/v4/node-tests.ts +++ b/types/node/v4/node-tests.ts @@ -561,6 +561,8 @@ namespace https_tests { }); https.request('http://www.example.com/xyz'); + + https.globalAgent.options.ca = []; } //////////////////////////////////////////////////// diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts index cd363c708c..6cfb45692b 100644 --- a/types/node/v6/node-tests.ts +++ b/types/node/v6/node-tests.ts @@ -1015,6 +1015,8 @@ namespace https_tests { }); https.request('http://www.example.com/xyz'); + + https.globalAgent.options.ca = []; } //////////////////////////////////////////////////// diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts index 0240dcc120..eb25e01f10 100644 --- a/types/node/v7/node-tests.ts +++ b/types/node/v7/node-tests.ts @@ -1093,6 +1093,8 @@ namespace https_tests { }); https.request('http://www.example.com/xyz'); + + https.globalAgent.options.ca = []; } //////////////////////////////////////////////////// diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts index 74d4c5c222..5cd7ad4586 100644 --- a/types/node/v8/node-tests.ts +++ b/types/node/v8/node-tests.ts @@ -1471,6 +1471,8 @@ namespace https_tests { https.request('http://www.example.com/xyz'); + https.globalAgent.options.ca = []; + { const server = new https.Server();