Merge pull request #34095 from nwtgck/remove-allow-http1-from-server-options

[node] Remove allowHTTP1 from http2.ServerOptions
This commit is contained in:
Sheetal Nandi
2019-03-22 12:02:26 -07:00
committed by GitHub
8 changed files with 8 additions and 20 deletions
+1 -3
View File
@@ -424,9 +424,7 @@ declare module "http2" {
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface ServerOptions extends ServerSessionOptions {
allowHTTP1?: boolean;
}
export interface ServerOptions extends ServerSessionOptions { }
export interface SecureServerOptions extends SecureServerSessionOptions {
allowHTTP1?: boolean;
+1 -2
View File
@@ -256,8 +256,7 @@ import { URL } from 'url';
paddingStrategy: 0,
peerMaxConcurrentStreams: 0,
selectPadding: (frameLen: number, maxFrameLen: number) => 0,
settings,
allowHTTP1: true
settings
};
// tslint:disable-next-line prefer-object-spread (ts2.1 feature)
const secureServerOptions: SecureServerOptions = Object.assign({}, serverOptions);
+1 -3
View File
@@ -424,9 +424,7 @@ declare module "http2" {
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface ServerOptions extends ServerSessionOptions {
allowHTTP1?: boolean;
}
export interface ServerOptions extends ServerSessionOptions { }
export interface SecureServerOptions extends SecureServerSessionOptions {
allowHTTP1?: boolean;
+1 -2
View File
@@ -4452,8 +4452,7 @@ import * as constants from 'constants';
paddingStrategy: 0,
peerMaxConcurrentStreams: 0,
selectPadding: (frameLen: number, maxFrameLen: number) => 0,
settings,
allowHTTP1: true
settings
};
// tslint:disable-next-line prefer-object-spread (ts2.1 feature)
const secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
+1 -3
View File
@@ -6710,9 +6710,7 @@ declare module "http2" {
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface ServerOptions extends ServerSessionOptions {
allowHTTP1?: boolean;
}
export interface ServerOptions extends ServerSessionOptions { }
export interface SecureServerOptions extends SecureServerSessionOptions {
allowHTTP1?: boolean;
+1 -2
View File
@@ -3686,8 +3686,7 @@ namespace http2_tests {
paddingStrategy: 0,
peerMaxConcurrentStreams: 0,
selectPadding: (frameLen: number, maxFrameLen: number) => 0,
settings,
allowHTTP1: true
settings
};
// tslint:disable-next-line prefer-object-spread (ts2.1 feature)
let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
+1 -3
View File
@@ -7135,9 +7135,7 @@ declare module "http2" {
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface ServerOptions extends ServerSessionOptions {
allowHTTP1?: boolean;
}
export interface ServerOptions extends ServerSessionOptions { }
export interface SecureServerOptions extends SecureServerSessionOptions {
allowHTTP1?: boolean;
+1 -2
View File
@@ -3741,8 +3741,7 @@ namespace http2_tests {
paddingStrategy: 0,
peerMaxConcurrentStreams: 0,
selectPadding: (frameLen: number, maxFrameLen: number) => 0,
settings,
allowHTTP1: true
settings
};
// tslint:disable-next-line prefer-object-spread (ts2.1 feature)
let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);