Skip to content
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

Jump to bottom

http2: set stricter default maxConcurrentStreams #29833

Closed
wants to merge 1 commit into from
Closed

http2: set stricter default maxConcurrentStreams #29833

wants to merge 1 commit into from

Conversation

ZYSzys
Copy link
Member

@ZYSzys ZYSzys commented Oct 3, 2019 •
edited
Loading

Set the default maxConcurrentStreams to NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS(0xffffffffu) and expose it so that we can get this value from http2.getDefaultSettings().

The original NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS(2 ** 31 - 1) was deprecated according to nghttp2, so I set the default maxConcurrentStreams to NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS(0xffffffffu) here:

node/deps/nghttp2/lib/nghttp2_session.h

Lines 102 to 103 in 88ef086

/* The default value of maximum number of concurrent streams. */
#define NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS 0xffffffffu

node/deps/nghttp2/lib/includes/nghttp2/nghttp2.h

Lines 699 to 716 in 88ef086

/**
* @macro
*
* .. warning::
*
* Deprecated. The initial max concurrent streams is 0xffffffffu.
*
* Default maximum number of incoming concurrent streams. Use
* `nghttp2_submit_settings()` with
* :enum:`NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS` to change the
* maximum number of incoming concurrent streams.
*
* .. note::
*
* The maximum number of outgoing concurrent streams is 100 by
* default.
*/
#define NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)

Fixes: #29763
Refs: nghttp2/nghttp2@16c4611

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@ZYSzys
http2: set default maxConcurrentStreams
321e373 
Set the default maxConcurrentStreams to
NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS.
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Oct 3, 2019
@ZYSzys ZYSzys added the http2 Issues or PRs related to the http2 subsystem. label Oct 3, 2019
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/25837/

@trivikr trivikr added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Oct 4, 2019
ZYSzys added a commit that referenced this pull request Oct 5, 2019
@ZYSzys
http2: set default maxConcurrentStreams
f0bee9b 
Set the default maxConcurrentStreams to
NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS.

PR-URL: #29833
Fixes: #29763
Refs: nghttp2/nghttp2@16c4611
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: David Carlier <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anto Aravinth <[email protected]>
@ZYSzys
Copy link
Member Author

ZYSzys commented Oct 5, 2019

Landed in f0bee9b.

@ZYSzys ZYSzys closed this Oct 5, 2019
@ZYSzys ZYSzys deleted the http2-setting-maxConcurrentStreams branch October 5, 2019 15:55
BridgeAR pushed a commit that referenced this pull request Oct 9, 2019
@ZYSzys @BridgeAR
http2: set default maxConcurrentStreams
3f15378 
Set the default maxConcurrentStreams to
NGHTTP2_DEFAULT_MAX_CONCURRENT_STREAMS.

PR-URL: #29833
Fixes: #29763
Refs: nghttp2/nghttp2@16c4611
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: David Carlier <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anto Aravinth <[email protected]>
@BridgeAR BridgeAR mentioned this pull request Oct 10, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell approved these changes

@addaleax addaleax addaleax approved these changes

@antsmartian antsmartian antsmartian approved these changes

@cjihrig cjihrig cjihrig approved these changes

@devnexen devnexen devnexen approved these changes

@trivikr trivikr trivikr approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. http2 Issues or PRs related to the http2 subsystem. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

http2.getDefaultSettings().maxConcurrentStreams is undefined
8 participants
@ZYSzys @nodejs-github-bot @jasnell @addaleax @antsmartian @cjihrig @devnexen @trivikr