Skip to content

http2: replace var with let/const #30417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pc3b3r wants to merge 3 commits into from
Closed

http2: replace var with let/const #30417

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f36cbd9
http2: replace var with let/const
pc3b3r Nov 12, 2019
c04da8c
Apply suggestions from code review
pc3b3r Nov 12, 2019
ace8b68
Update lib/internal/http2/util.js
pc3b3r Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
http2: replace var with let/const
  • Loading branch information
@pc3b3r
pc3b3r committed Nov 12, 2019
commit f36cbd9c280137eb24eb6fa60f06bcd14e2078de
30 changes: 15 additions & 15 deletions lib/internal/http2/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const IDX_OPTIONS_MAX_SESSION_MEMORY = 8;
const IDX_OPTIONS_FLAGS = 9;

function updateOptionsBuffer(options) {
var flags = 0;
let flags = 0;
if (typeof options.maxDeflateDynamicTableSize === 'number') {
flags |= (1 << IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE);
optionsBuffer[IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE] =
Expand Down Expand Up @@ -254,43 +254,43 @@ function getDefaultSettings() {
const flags = settingsBuffer[IDX_SETTINGS_FLAGS];

if ((flags & (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) ===
(1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) {
(1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.headerTableSize =
settingsBuffer[IDX_SETTINGS_HEADER_TABLE_SIZE];
}

if ((flags & (1 << IDX_SETTINGS_ENABLE_PUSH)) ===
(1 << IDX_SETTINGS_ENABLE_PUSH)) {
(1 << IDX_SETTINGS_ENABLE_PUSH)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.enablePush =
settingsBuffer[IDX_SETTINGS_ENABLE_PUSH] === 1;
}

if ((flags & (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) ===
(1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) {
(1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.initialWindowSize =
settingsBuffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE];
}

if ((flags & (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) ===
(1 << IDX_SETTINGS_MAX_FRAME_SIZE)) {
(1 << IDX_SETTINGS_MAX_FRAME_SIZE)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.maxFrameSize =
settingsBuffer[IDX_SETTINGS_MAX_FRAME_SIZE];
}

if ((flags & (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) ===
(1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) {
(1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.maxConcurrentStreams =
settingsBuffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS];
}

if ((flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) ===
(1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
(1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.maxHeaderListSize =
settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE];
}

if ((flags & (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) ===
(1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) {
(1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
holder.enableConnectProtocol =
settingsBuffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL];
}
Expand Down Expand Up @@ -318,7 +318,7 @@ function getSettings(session, remote) {
}

function updateSettingsBuffer(settings) {
var flags = 0;
let flags = 0;
if (typeof settings.headerTableSize === 'number') {
flags |= (1 << IDX_SETTINGS_HEADER_TABLE_SIZE);
settingsBuffer[IDX_SETTINGS_HEADER_TABLE_SIZE] =
Expand Down Expand Up @@ -507,9 +507,9 @@ class NghttpError extends Error {

const assertIsObject = hideStackFrames((value, name, types) => {
if (value !== undefined &&
(value === null ||
typeof value !== 'object' ||
Array.isArray(value))) {
(value === null ||
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
typeof value !== 'object' ||
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
Array.isArray(value))) {
Comment thread
pc3b3r marked this conversation as resolved.
Outdated
throw new ERR_INVALID_ARG_TYPE(name, types || 'Object', value);
}
});
Expand All @@ -527,11 +527,11 @@ const assertWithinRange = hideStackFrames(
function toHeaderObject(headers) {
const obj = Object.create(null);
for (var n = 0; n < headers.length; n = n + 2) {
var name = headers[n];
var value = headers[n + 1];
const name = headers[n];
let value = headers[n + 1];
if (name === HTTP2_HEADER_STATUS)
value |= 0;
var existing = obj[name];
const existing = obj[name];
if (existing === undefined) {
obj[name] = name === HTTP2_HEADER_SET_COOKIE ? [value] : value;
} else if (!kSingleValueHeaders.has(name)) {
Expand Down