-
Notifications
You must be signed in to change notification settings - Fork 227
8342075: HttpClient: improve HTTP/2 flow control checks #3786
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
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
@GoeLin This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 15 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
This backport pull request has now been updated with issue from the original commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the backport! The changes look good to me
3349b52
to
c86d9d2
Compare
@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
HI @alexeybakhtin |
Yes, I forgot about these changes. I think they could be useful here to clean up resources. |
Thanks, I added them. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
Thanks for the review! |
/integrate |
Going to push as commit 4addb57.
Your commit was automatically rebased without conflicts. |
I backport this for parity with 17.0.17-oracle based on the change in 21.
src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
Two trivial resolves due to context.
src/java.net.http/share/classes/jdk/internal/net/http/WindowUpdateSender.java
Resolved because 8308310: HttpClient: Avoid logging or locking from within synchronized blocks
is not in 17.
src/java.net.http/share/classes/module-info.java
Omitted, as "8296804: Document HttpClient configuration properties in java.net.http module-info"
is not in 17. The CSR for 17 documents that this is dropped.
Follow ups are on the list of backports I will do.
Blocking changes all already in 17.
I had to adapt ConnectionFlowControlTest.java and StreamFlowControlTest.java because HttpClient does not
implement AutoClosable / shutdownNow() / close() in 17.
I also amended the @build instructions in StreamFlowControlTest.java.
Progress
Issues
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3786/head:pull/3786
$ git checkout pull/3786
Update a local copy of the PR:
$ git checkout pull/3786
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3786/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3786
View PR using the GUI difftool:
$ git pr show -t 3786
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3786.diff
Using Webrev
Link to Webrev Comment