From 63e6236af8cdb8e278eeaee00556097db01d130e Mon Sep 17 00:00:00 2001
From: Kevin Greene <kevin.greene@creditkarma.com>
Date: Mon, 23 Oct 2017 15:32:52 -0700
Subject: [PATCH] Fix to just make ClientRequestArgs an alias of RequestOptions

---
 types/node/v4/index.d.ts | 8 +++++---
 types/node/v6/index.d.ts | 8 +++++---
 types/node/v7/index.d.ts | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 59c298e328..45f882ebd4 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -575,7 +575,7 @@ declare module "http" {
         [header: string]: number | string | string[] | undefined;
     }
 
-    export interface ClientRequestArgs {
+    export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
@@ -591,6 +591,8 @@ declare module "http" {
         timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -731,7 +733,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: ClientRequestArgs | string, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -927,7 +929,7 @@ declare module "https" {
         SNICallback?: (servername: string) => any;
     }
 
-    export interface RequestOptions extends http.ClientRequestArgs {
+    export interface RequestOptions extends http.RequestOptions {
         pfx?: any;
         key?: any;
         passphrase?: string;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 1e20793cd7..3f0379cc5a 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -647,7 +647,7 @@ declare module "http" {
         [header: string]: number | string | string[] | undefined;
     }
 
-    export interface ClientRequestArgs {
+    export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
@@ -663,6 +663,8 @@ declare module "http" {
         timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -809,7 +811,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: ClientRequestArgs | string, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -1334,7 +1336,7 @@ declare module "https" {
         SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
     }
 
-    export interface RequestOptions extends http.ClientRequestArgs {
+    export interface RequestOptions extends http.RequestOptions {
         pfx?: any;
         key?: any;
         passphrase?: string;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 0df238119a..3ed2634aa9 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -664,7 +664,7 @@ declare module "http" {
         [header: string]: number | string | string[] | undefined;
     }
 
-    export interface ClientRequestArgs {
+    export interface RequestOptions {
         protocol?: string;
         host?: string;
         hostname?: string;
@@ -680,6 +680,8 @@ declare module "http" {
         timeout?: number;
     }
 
+    export type ClientRequestArgs = RequestOptions
+
     export interface Server extends net.Server {
         setTimeout(msecs: number, callback: Function): void;
         maxHeadersCount: number;
@@ -826,7 +828,7 @@ declare module "http" {
     };
     export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) => void): Server;
     export function createClient(port?: number, host?: string): any;
-    export function request(options: ClientRequestArgs | string, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function request(options: RequestOptions | string, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
@@ -1399,7 +1401,7 @@ declare module "https" {
         SNICallback?: (servername: string, cb: (err: Error, ctx: tls.SecureContext) => any) => any;
     }
 
-    export interface RequestOptions extends http.ClientRequestArgs {
+    export interface RequestOptions extends http.RequestOptions {
         pfx?: any;
         key?: any;
         passphrase?: string;