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

8291637: HttpClient default keep alive timeout not followed if server sends invalid value #466

Closed
wants to merge 8 commits into from

Conversation

dhanalla
Copy link

@dhanalla dhanalla commented Mar 4, 2024

Backport b17a745d7f55941f02b0bdde83866aa5d32cce07

Clean backport from JDK11u patch.

Test performed:

  1. JTreg jdk_tier1, hotspot_tier1
  2. JTreg jdk_tier2
  3. The backported test case in this PR passed after applying this patch.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8291637 needs maintainer approval

Issue

  • JDK-8291637: HttpClient default keep alive timeout not followed if server sends invalid value (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/466/head:pull/466
$ git checkout pull/466

Update a local copy of the PR:
$ git checkout pull/466
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/466/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 466

View PR using the GUI difftool:
$ git pr show -t 466

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/466.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 4, 2024

👋 Welcome back dhanalla! A progress list of the required criteria for merging this PR into pr/437 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport b17a745d7f55941f02b0bdde83866aa5d32cce07 8291637: HttpClient default keep alive timeout not followed if server sends invalid value Mar 4, 2024
@openjdk
Copy link

openjdk bot commented Mar 4, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 4, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 4, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

@dhanalla This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8291637: HttpClient default keep alive timeout not followed if server sends invalid value

Reviewed-by: sgehwolf

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 1 new commit pushed to the master branch:

  • d23bbdd: 8256152: tests fail because of ambiguous method resolution

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/437 to master March 19, 2024 16:30
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout Backport-JDK-8291637
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Mar 19, 2024

@dhanalla this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout Backport-JDK-8291637
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 19, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Mar 19, 2024
Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 19, 2024

⚠️ @dhanalla This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@jerboaa
Copy link
Contributor

jerboaa commented Mar 19, 2024

GHA failures are https://bugs.openjdk.org/browse/JDK-8324583

@openjdk openjdk bot added the approval label Mar 19, 2024
@dhanalla
Copy link
Author

LGTM.
Thank you for reviewing this PR @jerboaa. I have submitted a bug approval request.

@jerboaa
Copy link
Contributor

jerboaa commented Mar 22, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@jerboaa
8291637: The approval request has been approved.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2024
@openjdk openjdk bot removed the approval label Mar 22, 2024
@dhanalla
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 25, 2024
@openjdk
Copy link

openjdk bot commented Mar 25, 2024

@dhanalla
Your change (at version 5c9b7a7) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Mar 26, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 26, 2024

Going to push as commit 039fb8a.
Since your change was applied there has been 1 commit pushed to the master branch:

  • d23bbdd: 8256152: tests fail because of ambiguous method resolution

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 26, 2024
@openjdk openjdk bot closed this Mar 26, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 26, 2024
@openjdk
Copy link

openjdk bot commented Mar 26, 2024

@jerboaa @dhanalla Pushed as commit 039fb8a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants