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

8274524: SSLSocket.close() hangs if it is called during the ssl handshake #823

Closed
wants to merge 1 commit into from

Conversation

alexeybakhtin
Copy link
Contributor

@alexeybakhtin alexeybakhtin commented Feb 14, 2022

Backport of JDK-8274524 to JDK11u-dev
Backport is almost clean except for a trivial fix for Pattern Matching in the instanceof (not available in JDK11) and braces for the if-clauses.
sun/security/ssl/SSLSocketImpl tests passed


Progress

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

Issue

  • JDK-8274524: SSLSocket.close() hangs if it is called during the ssl handshake

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 823

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 14, 2022

👋 Welcome back abakhtin! 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 58dae60da0711c4ae0cb23f8ce2328e051d603b2 8274524: SSLSocket.close() hangs if it is called during the ssl handshake Feb 14, 2022
@openjdk
Copy link

openjdk bot commented Feb 14, 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 Feb 14, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 14, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Lgtm.

@openjdk
Copy link

openjdk bot commented Feb 14, 2022

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

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

8274524: SSLSocket.close() hangs if it is called during the ssl handshake

Reviewed-by: phh

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 8 new commits pushed to the master branch:

  • e2f792c: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
  • d6bf0d1: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication
  • b5f8c31: 8254072: AArch64: Get rid of --disable-warnings-as-errors on Windows+ARM64 build
  • 0aa5f75: 8262894: [macos_aarch64] SIGBUS in Assembler::ld_st2
  • 69583df: 8266889: [macosx-aarch64] Crash with SIGBUS in MarkActivationClosure::do_code_blob during vmTestbase/nsk/jvmti/.../bi04t002 test run
  • aa42c4d: 8241004: NMT tests fail on unaligned thread size with debug build
  • eb0708f: 8253795: Implementation of JEP 391: macOS/AArch64 Port
  • fe17b44: 8280414: Memory leak in DefaultProxySelector

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 (@phohensee) 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 openjdk bot added the ready Pull request is ready to be integrated label Feb 14, 2022
@alexeybakhtin
Copy link
Contributor Author

alexeybakhtin commented Feb 17, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 17, 2022
@openjdk
Copy link

openjdk bot commented Feb 17, 2022

@alexeybakhtin
Your change (at version 8eb45c2) is now ready to be sponsored by a Committer.

@yan-too
Copy link

yan-too commented Feb 17, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 17, 2022

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

  • e2f792c: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
  • d6bf0d1: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication
  • b5f8c31: 8254072: AArch64: Get rid of --disable-warnings-as-errors on Windows+ARM64 build
  • 0aa5f75: 8262894: [macos_aarch64] SIGBUS in Assembler::ld_st2
  • 69583df: 8266889: [macosx-aarch64] Crash with SIGBUS in MarkActivationClosure::do_code_blob during vmTestbase/nsk/jvmti/.../bi04t002 test run
  • aa42c4d: 8241004: NMT tests fail on unaligned thread size with debug build
  • eb0708f: 8253795: Implementation of JEP 391: macOS/AArch64 Port
  • fe17b44: 8280414: Memory leak in DefaultProxySelector

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 17, 2022
@openjdk openjdk bot closed this Feb 17, 2022
@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 Feb 17, 2022
@openjdk
Copy link

openjdk bot commented Feb 17, 2022

@yan-too @alexeybakhtin Pushed as commit 57003ee.

💡 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
3 participants