Skip to content

8263031: HttpClient throws Exception if it receives a Push Promise that is too large#400

Closed
martinuy wants to merge 2 commits intoopenjdk:masterfrom
martinuy:JDK-8263031
Closed

8263031: HttpClient throws Exception if it receives a Push Promise that is too large#400
martinuy wants to merge 2 commits intoopenjdk:masterfrom
martinuy:JDK-8263031

Conversation

@martinuy
Copy link
Contributor

@martinuy martinuy commented Sep 26, 2024

Hi,

Can I have a review for the backport of JDK-8263031 to 17u?

The JDK main line patch did not apply cleanly because JDK-8295944 was backported to 17u already and tests were moved.

In addition, I had to make changes to PushPromiseContinuation.java to adapt the test to its new location (see jtreg header diff) and context (see the invocations to conn.addToOutputQ). With these changes, the test is passing.

No regressions observed in the jdk/java/net/httpclient tests category.

Thanks,
Martin.-


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-8263031 needs maintainer approval

Warnings

 ⚠️ Patch contains a binary file (test/jdk/java/util/zip/ZipFile/crash.jar)
 ⚠️ Patch contains a binary file (test/jdk/java/util/zip/ZipFile/input.jar)
 ⚠️ Patch contains a binary file (test/jdk/java/util/zip/ZipFile/input.zip)

Issue

  • JDK-8263031: HttpClient throws Exception if it receives a Push Promise that is too large (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u.git pull/400/head:pull/400
$ git checkout pull/400

Update a local copy of the PR:
$ git checkout pull/400
$ git pull https://git.openjdk.org/jdk17u.git pull/400/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 400

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u/pull/400.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 26, 2024

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

@openjdk
Copy link

openjdk bot commented Sep 26, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 4d2cd26ab5092ad0a169e4239164a869a4255bd3 8263031: HttpClient throws Exception if it receives a Push Promise that is too large Sep 26, 2024
@openjdk
Copy link

openjdk bot commented Sep 26, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 26, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 26, 2024

Webrevs

@GoeLin
Copy link
Member

GoeLin commented Sep 26, 2024

Please enable the GHA action tests!

@gnu-andrew
Copy link
Member

Please enable the GHA action tests!

I think the problem here is this is against 17u, not 17u-dev. 17u is closed for the October release: https://wiki.openjdk.org/display/JDKUpdates/JDK+17u

@martinuy
Copy link
Contributor Author

martinuy commented Sep 26, 2024 via email

@gnu-andrew
Copy link
Member

I forgot to enable the GHA when forking. They're disabled by default. Running manually now.

The PR should be against 17u-dev.

Copy link
Contributor

@alexeybakhtin alexeybakhtin Sep 26, 2024

Choose a reason for hiding this comment

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

I think the module section is not required anymore as soon as JDK-8295944 in the JDK17 already

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Thanks.

@martinuy
Copy link
Contributor Author

I forgot to enable the GHA when forking. They're disabled by default. Running manually now.

The PR should be against 17u-dev.

It's my understanding that @RealCLanger prefers PRs against stable repositories when they are for critical fixes in the last part of the cycle. While I tend to agree with that choice, I'm okay with anything as long as there is a unified criteria.

@alexeybakhtin
Copy link
Contributor

alexeybakhtin commented Sep 26, 2024

Looks good to me. Unfortunately, I have no review status and can not officially approve

@openjdk
Copy link

openjdk bot commented Sep 27, 2024

⚠️ @martinuy 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.

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2024

@martinuy This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk
Copy link

openjdk bot commented Oct 30, 2024

@martinuy 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 JDK-8263031
git fetch https://git.openjdk.org/jdk17u.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 Oct 30, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 31, 2024

@martinuy This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

1 similar comment
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 31, 2024

@martinuy This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 18, 2024

@martinuy This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

5 participants

Comments