undid TlsOptions name change

This commit is contained in:
Huw McNamara
2018-02-13 18:25:43 +00:00
parent 289d1294d0
commit 6c98b1f3d8
9 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ export interface FtpServerOptions {
/**
* If this is set, the server will allow explicit TLS authentication. Value should be a dictionary which is suitable as the options argument of tls.createServer.
*/
tlsOptions?: tls.TlsServerOptions;
tlsOptions?: tls.TlsOptions;
/**
* If this is set to true, and tlsOptions is also set, then the server will not allow logins over non-secure connections.
* Default false
+1 -1
View File
@@ -43,7 +43,7 @@ declare namespace proxy {
target?: string;
forward?: string;
agent?: http.Agent;
ssl?: tls.TlsServerOptions;
ssl?: tls.TlsOptions;
ws?: boolean;
xfwd?: boolean;
secure?: boolean;
+4 -4
View File
@@ -1741,7 +1741,7 @@ declare module "https" {
import * as http from "http";
import { URL } from "url";
export type ServerOptions = tls.SecureContextOptions & tls.TlsServerOptions;
export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
export type RequestOptions = http.RequestOptions & {
rejectUnauthorized?: boolean; // Defaults to true
@@ -4954,7 +4954,7 @@ declare module "tls" {
prependOnceListener(event: "secureConnect", listener: () => void): this;
}
export interface TlsServerOptions extends SecureContextOptions {
export interface TlsOptions extends SecureContextOptions {
clientCertEngine?: string;
handshakeTimeout?: number;
requestCert?: boolean;
@@ -5091,7 +5091,7 @@ declare module "tls" {
* Returns Error object, populating it with the reason, host and cert on failure. On success, returns undefined.
*/
export function checkServerIdentity(host: string, cert: PeerCertificate): Error | undefined;
export function createServer(options: TlsServerOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
export function createServer(options: TlsOptions, secureConnectionListener?: (socket: TLSSocket) => void): Server;
export function connect(options: ConnectionOptions, secureConnectionListener?: () => void): TLSSocket;
export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
@@ -6490,7 +6490,7 @@ declare module "http2" {
export type ServerSessionOptions = SessionOptions;
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsServerOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface ServerOptions extends ServerSessionOptions {
allowHTTP1?: boolean;
+1 -1
View File
@@ -21,7 +21,7 @@ declare namespace fetch {
userAgent?: string;
body?: Buffer | string | { [key: string]: string };
contentType?: string | false;
tls?: tls.TlsServerOptions;
tls?: tls.TlsOptions;
timeout?: ms;
allowErrorResponse?: boolean;
}
+2 -2
View File
@@ -26,10 +26,10 @@ export interface Defaults extends ConnectionConfig {
parseInt8?: boolean;
}
import { TlsServerOptions } from "tls";
import { TlsOptions } from "tls";
export interface ClientConfig extends ConnectionConfig {
ssl?: boolean | TlsServerOptions;
ssl?: boolean | TlsOptions;
}
export interface PoolConfig extends ClientConfig {
+2 -2
View File
@@ -29,10 +29,10 @@ export interface Defaults extends ConnectionConfig {
parseInt8?: boolean;
}
import { TlsServerOptions } from "tls";
import { TlsOptions } from "tls";
export interface ClientConfig extends ConnectionConfig {
ssl?: boolean | TlsServerOptions;
ssl?: boolean | TlsOptions;
}
export interface PoolConfig extends ClientConfig {
+4 -4
View File
@@ -93,7 +93,7 @@ export interface SMTPServerSession {
envelope: SMTPServerEnvelope;
transmissionType: string;
tlsOptions: tls.TlsServerOptions;
tlsOptions: tls.TlsOptions;
}
export interface SMTPServerEnvelope {
@@ -107,7 +107,7 @@ export interface SMTPServerEnvelope {
rcptTo: SMTPServerAddress[];
}
export interface SMTPServerOptions extends tls.TlsServerOptions {
export interface SMTPServerOptions extends tls.TlsOptions {
/**
* if true, the connection will use TLS. The default is false.
* If the server doesn't start in TLS mode,
@@ -188,7 +188,7 @@ export interface SMTPServerOptions extends tls.TlsServerOptions {
/**
* optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback.
*/
sniOptions?: { [servername: string]: tls.TlsServerOptions } | Map<string, tls.TlsServerOptions>;
sniOptions?: { [servername: string]: tls.TlsOptions } | Map<string, tls.TlsOptions>;
/**
* optional boolean, if set to true then upgrade sockets to TLS immediately after connection is established. Works with secure: true
*/
@@ -282,7 +282,7 @@ export class SMTPServer extends EventEmitter {
/** Closes the server */
close(callback: (err?: Error | null) => void): void;
updateSecureContext(options: tls.TlsServerOptions): void;
updateSecureContext(options: tls.TlsOptions): void;
/** Authentication handler. Override this */
onAuth(auth: SMTPServerAuthentication, session: SMTPServerSession, callback: (err: Error | null | undefined, response: SMTPServerAuthenticationResponse) => void): void;
+1 -1
View File
@@ -236,7 +236,7 @@ export interface ServerOptions<TProcessor, THandler> extends ServiceOptions<TPro
files?: string;
headers?: HttpHeaders;
services?: ServiceMap<TProcessor, THandler>;
tls?: tls.TlsServerOptions;
tls?: tls.TlsOptions;
}
export interface ConnectOptions {
+2 -2
View File
@@ -9,7 +9,7 @@ declare module 'xmlrpc' {
import { EventEmitter } from 'events';
import { Server as HttpServer } from 'http';
import { Server as HttpsServer } from 'https';
import { TlsServerOptions } from 'tls';
import { TlsOptions } from 'tls';
interface ClientOptions {
host?: string;
@@ -47,7 +47,7 @@ declare module 'xmlrpc' {
function createSecureClient(options: string | ClientOptions): Client;
function createServer(options: string | ServerOptions, callback: () => void): Server;
function createSecureServer(options: string | TlsServerOptions, callback: () => void): Server;
function createSecureServer(options: string | TlsOptions, callback: () => void): Server;
interface Client {
options: ClientOptions;