Skip to content

8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException#825

Closed
jerboaa wants to merge 1 commit into
openjdk:masterfrom
jerboaa:jdk-8239798-8u-backport
Closed

8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException#825
jerboaa wants to merge 1 commit into
openjdk:masterfrom
jerboaa:jdk-8239798-8u-backport

Conversation

@jerboaa

@jerboaa jerboaa commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

Almost clean backport, but for the differences in the TLS 1.3 backport which omitted the DTLS part. Thus, ProtocolVersion.isNegotiable() has a different signature (missing the second last boolean of isDTLS). Otherwise a clean backport. This is in preparation for #808.

Testing:

  • jdk/test/javax/net/ssl, jdk/test/sun/net/www/protocol/https/ and jdk/test/sun/security/ssl/ with the following results: Test results: passed: 264; failed: 2; error: 1. Note the total number of 264 over current master, since this patch also enables ClientTimeout.java which passes.
  • GHA

Thoughts?



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

Issue

  • JDK-8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException (Bug - P2 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/825/head:pull/825
$ git checkout pull/825

Update a local copy of the PR:
$ git checkout pull/825
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/825/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 825

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/825.diff

Using Webrev

Link to Webrev Comment

8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException
@bridgekeeper

bridgekeeper Bot commented Jun 3, 2026

Copy link
Copy Markdown

👋 Welcome back sgehwolf! 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 commented Jun 3, 2026

Copy link
Copy Markdown

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

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

8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException

Reviewed-by: andrew

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

  • 11d368c: 8372351: Add 2 WISeKey roots
  • bb816ae: 8383354: Update LCMS to 2.19.1

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.

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

@openjdk openjdk Bot changed the title Backport 0852c045d717a42f56773686f0f1c9e45d0318c6 8239798: SSLSocket closes socket both socket endpoints on a SocketTimeoutException Jun 3, 2026
@openjdk

openjdk Bot commented Jun 3, 2026

Copy link
Copy Markdown

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 Jun 3, 2026
@mlbridge

mlbridge Bot commented Jun 3, 2026

Copy link
Copy Markdown

Webrevs

@jerboaa

jerboaa commented Jun 3, 2026

Copy link
Copy Markdown
Contributor Author

GHA failures are the same jdk/security_infra failures we see elsewhere.

@gnu-andrew gnu-andrew left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm surprised this is so clean but I guess that is due to the import of the new TLS implementation and this patch following not long after.

Backport & testing look good to me.

@openjdk

openjdk Bot commented Jun 4, 2026

Copy link
Copy Markdown

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

@jerboaa

jerboaa commented Jun 5, 2026

Copy link
Copy Markdown
Contributor Author

/approval request Please approve this backport to the JDK 8u TLS stack which almost applies cleanly modulo path changes. The differences is in no DTLS in 8u vs. 11u. The motivation for backporting this is to get a crypto roadmap update into 8u. Patch has been reviewed by Andrew Hughes. TLS tests pass. Risk is medium, but it's been in Oracle 8u for a while and we've not seen issues in 11u as well.

@openjdk

openjdk Bot commented Jun 5, 2026

Copy link
Copy Markdown

@jerboaa
8239798: The approval request has been created successfully.

@openjdk openjdk Bot added the approval Requires approval; will be removed when approval is received label Jun 5, 2026
@gnu-andrew

Copy link
Copy Markdown
Member

/approve yes

@openjdk

openjdk Bot commented Jun 5, 2026

Copy link
Copy Markdown

@gnu-andrew
8239798: The approval request has been approved.

@openjdk openjdk Bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 5, 2026
@jerboaa

jerboaa commented Jun 8, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@openjdk

openjdk Bot commented Jun 8, 2026

Copy link
Copy Markdown

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

  • 11d368c: 8372351: Add 2 WISeKey roots
  • bb816ae: 8383354: Update LCMS to 2.19.1

Your commit was automatically rebased without conflicts.

@openjdk openjdk Bot added the integrated Pull request has been integrated label Jun 8, 2026
@openjdk openjdk Bot closed this Jun 8, 2026
@openjdk openjdk Bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 8, 2026
@openjdk

openjdk Bot commented Jun 8, 2026

Copy link
Copy Markdown

@jerboaa Pushed as commit 40be762.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants