https: only use default ALPNProtocols when appropriate · nodejs/node@41f5eac · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 750
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 41f5eac

Browse filesBrowse the repository at this point in the historyBrowse files

mscdex

authored and

targos

committed

https: only use default ALPNProtocols when appropriate

PR-URL: #54411 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: James M Snell <jasnell@gmail.com>

1 parent 4d361b3 commit 41f5eac
Copy full SHA for 41f5eac

2 files changed

+17-4Lines changed: 17 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • https.js
• test/parallel
  • test-https-argument-of-creating.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/https.js‎

Copy file name to clipboardExpand all lines: lib/https.js

+6-4Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -62,23 +62,25 @@ const { validateObject } = require('internal/validators');
62	62	function Server(opts, requestListener) {
63	63	if (!(this instanceof Server)) return new Server(opts, requestListener);
64	64
	65	+ let ALPNProtocols = ['http/1.1'];
65	66	if (typeof opts === 'function') {
66	67	requestListener = opts;
67	68	opts = kEmptyObject;
68	69	} else if (opts == null) {
69	70	opts = kEmptyObject;
70	71	} else {
71	72	validateObject(opts, 'options');
	73	+ // Only one of ALPNProtocols and ALPNCallback can be set, so make sure we
	74	+ // only set a default ALPNProtocols if the caller has not set either of them
	75	+ if (opts.ALPNProtocols || opts.ALPNCallback)
	76	+ ALPNProtocols = undefined;
72	77	}
73	78
74	79	FunctionPrototypeCall(storeHTTPOptions, this, opts);
75	80	FunctionPrototypeCall(tls.Server, this,
76	81	{
77	82	noDelay: true,
78		- // http/1.0 is not defined as Protocol IDs in IANA
79		- // https://www.iana.org/assignments/tls-extensiontype-values
80		- // /tls-extensiontype-values.xhtml#alpn-protocol-ids
81		- ALPNProtocols: ['http/1.1'],
	83	+ ALPNProtocols,
82	84	...opts,
83	85	},
84	86	_connectionListener);

Collapse file

‎test/parallel/test-https-argument-of-creating.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-https-argument-of-creating.js

+11Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -45,3 +45,14 @@ const dftProtocol = {};
45	45	0);
46	46	assert.strictEqual(server.listeners('request').length, 0);
47	47	}
	48	+
	49	+
	50	+ // Validate that `createServer` only uses defaults when appropriate
	51	+ {
	52	+ const ALPNCallback = () => {};
	53	+ const server = https.createServer({
	54	+ ALPNCallback,
	55	+ });
	56	+ assert.strictEqual(server.ALPNProtocols, undefined);
	57	+ assert.strictEqual(server.ALPNCallback, ALPNCallback);
	58	+ }

0 commit comments

Comments

0 (0)