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

8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream #918

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 18, 2022

I backport this for parity with 11.0.16-oracle.

I removed "...".formatted() calls. That is not supported in 11.

This was already reviewed in #530.
8222938 was backported in the meantime.

As this is only a test change and is identical to the already reviewed change, I mark this as clean.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/918/head:pull/918
$ git checkout pull/918

Update a local copy of the PR:
$ git checkout pull/918
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/918/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 918

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/918.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport 5caa77b043ae490c3d7d56d181d0e07e6b859b9e 8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

/clean

@openjdk openjdk bot added the clean label Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

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

8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 18, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 18, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 19, 2022

Pre-submit failure: runtime/Thread/StopAtExit.java fixed in jdk11u

@GoeLin
Copy link
Member Author

GoeLin commented Mar 20, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 20, 2022

Going to push as commit cf52a6f.
Since your change was applied there have been 5 commits pushed to the master branch:

  • f14b932: 8246494: introduce vm.flagless at-requires property
  • e66e3e5: 8210108: sun/tools/jstatd test build failures after JDK-8210022
  • dd6ba08: 8210649: AssertionError @ jdk.compiler/com.sun.tools.javac.comp.Modules.enter(Modules.java:244)
  • e6f8c1e: 8240734: ModuleHashes attribute not reproducible between builds
  • 23af0b1: 8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell MakeJAR.sh target

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 20, 2022

@GoeLin Pushed as commit cf52a6f.

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

@GoeLin GoeLin deleted the goetz_backport_8263364-2 branch March 20, 2022 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant