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 #161

Closed
wants to merge 1 commit into from

Conversation

alexeybakhtin
Copy link

@alexeybakhtin alexeybakhtin commented Feb 14, 2022

This is a clean backport of JDK-8274524 to JDK17u-dev
sun/security/ssl/SSLSocketImpl tests passed


Progress

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

Issue

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 161

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/161.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
Copy link

openjdk bot commented Feb 14, 2022

@alexeybakhtin 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:

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

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

  • 2011c35: 8274562: (fs) UserDefinedFileAttributeView doesn't correctly determine if supported when using OverlayFS
  • ab3dd20: 8273655: content-types.properties files are missing some common types
  • a7010a2: 8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344
  • 7833c7d: 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492
  • 8207e69: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication

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.

➡️ 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 14, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 14, 2022

Webrevs

@alexeybakhtin
Copy link
Author

alexeybakhtin commented Feb 16, 2022

/integrate

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

openjdk bot commented Feb 16, 2022

@alexeybakhtin
Your change (at version 5fee025) 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 d54675b.
Since your change was applied there have been 7 commits pushed to the master branch:

  • a59e8cb: 8278346: java/nio/file/Files/probeContentType/Basic.java fails on Linux SLES15 machine
  • 0e5810d: 8274171: java/nio/file/Files/probeContentType/Basic.java failed on "Content type" mismatches
  • 2011c35: 8274562: (fs) UserDefinedFileAttributeView doesn't correctly determine if supported when using OverlayFS
  • ab3dd20: 8273655: content-types.properties files are missing some common types
  • a7010a2: 8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344
  • 7833c7d: 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492
  • 8207e69: 8272541: Incorrect overflow test in Toom-Cook branch of BigInteger multiplication

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 d54675b.

💡 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 clean integrated Pull request has been integrated
2 participants