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.

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

zlib: fix interaction of flushing and needDrain #14527

Closed
wants to merge 1 commit into from

Conversation

addaleax
Copy link
Member

Fixes: #14523

I’d appreciate a review from @aaliddell who has obviously given this some thought.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

zlib

@addaleax addaleax added lts-watch-v4.x zlib Issues and PRs related to the zlib subsystem. labels Jul 28, 2017
@aaliddell
Copy link

Excellent, that was quick! The solution looks good and satisfies the original intention of #3534.

I wouldn't be able to check it against the original SSE code until Mon, but with those tests passing then I can't see any reason it wouldn't also be resolved, so don't let that block this.

});
}

(async function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fancy! I wasn't aware this was possible...

@Fishrock123
Copy link
Contributor

Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@addaleax addaleax force-pushed the zlib-flush-needdrain branch from cf9e75e to ff2dc30 Compare July 29, 2017 10:53
@addaleax
Copy link
Member Author

Landed in 717a138 (and resisted the urge to replace flushiness with fluffiness while landing…)

@addaleax addaleax closed this Jul 31, 2017
@addaleax addaleax deleted the zlib-flush-needdrain branch July 31, 2017 20:47
addaleax added a commit that referenced this pull request Jul 31, 2017
Fixes: #14523
PR-URL: #14527
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
addaleax added a commit to addaleax/node that referenced this pull request Aug 1, 2017
Fixes: nodejs#14523
PR-URL: nodejs#14527
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
addaleax added a commit that referenced this pull request Aug 2, 2017
Backport-PR-URL: #14571
Backport-Reviewed-By: James M Snell <jasnell@gmail.com>

Fixes: #14523
PR-URL: #14527
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@addaleax addaleax mentioned this pull request Aug 2, 2017
@MylesBorins
Copy link
Contributor

This is going to need manual backports to both v4.x and v6.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
zlib Issues and PRs related to the zlib subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants