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

Closed
wants to merge 1 commit into from

Conversation

pkumaraswamy
Copy link

@pkumaraswamy pkumaraswamy commented Mar 7, 2022

This is a clean backport.
The fix has been confirmed by running against internal test suite and JCK SSL tests, where the initial failure was observed in test api/javax_net/ssl/SSLSocket/setUseClientMode.html


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/jdk18u pull/33/head:pull/33
$ git checkout pull/33

Update a local copy of the PR:
$ git checkout pull/33
$ git pull https://git.openjdk.java.net/jdk18u pull/33/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 33

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk18u/pull/33.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2022

👋 Welcome back pkumaraswamy! 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 Mar 7, 2022
@openjdk
Copy link

openjdk bot commented Mar 7, 2022

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

@openjdk
Copy link

openjdk bot commented Mar 7, 2022

@pkumaraswamy 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 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.

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 Mar 7, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2022

Webrevs

@pkumaraswamy
Copy link
Author

pkumaraswamy commented Mar 7, 2022

/integrate

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

openjdk bot commented Mar 7, 2022

@pkumaraswamy
Your change (at version daf1548) is now ready to be sponsored by a Committer.

@coffeys
Copy link
Contributor

coffeys commented Mar 10, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 10, 2022

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

  • 9bd2fc6: 8281093: Violating Attribute-Value Normalization in the XML specification 1.0
  • 16ff056: 8276990: Memory leak in invoker.c fillInvokeRequest() during JDI operations
  • 32c0aa2: 8278186: org.jcp.xml.dsig.internal.dom.Utils.parseIdFromSameDocumentURI throws StringIndexOutOfBoundsException when calling substring method

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 10, 2022

@coffeys @pkumaraswamy Pushed as commit afae492.

💡 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