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

8282600: SSLSocketImpl should not use user_canceled workaround when not necessary #709

Closed
wants to merge 1 commit into from

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Sep 21, 2022

Backport fixing SSLSocket, not to use workaround with user_canceled alert for TLS 1.3 close, when not necessary, as it causes problems with gnutls client.

Applied cleanly. Passed jdk_security tests.


Progress

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

Issue

  • JDK-8282600: SSLSocketImpl should not use user_canceled workaround when not necessary

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 709

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 21, 2022

👋 Welcome back zzambers! 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 7e88ff8a82cefa2a20acc9d5a9e42858d60fe3a3 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary Sep 21, 2022
@openjdk
Copy link

openjdk bot commented Sep 21, 2022

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

@openjdk
Copy link

openjdk bot commented Sep 21, 2022

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

8282600: SSLSocketImpl should not use user_canceled workaround when not necessary

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

  • 6624f71: 8292586: simplify cleanups in NTLMAuthSequence getCredentialsHandle
  • ce949ba: 8276904: Optional.toString() is unnecessarily expensive
  • ca8e16d: 8284732: FFI_GO_CLOSURES macro not defined but required for zero build on Mac OS X
  • 0657a3a: 8280511: AArch64: Combine shift and negate to a single instruction
  • 2d4fec4: 8292866: Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation check MultiByteToWideChar return value for failures
  • 13ecd42: 8282642: vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java fails intermittently with exit code 1
  • 3d93fdc: 8294357: (tz) Update Timezone Data to 2022d
  • 29fea3f: 8291599: Assertion in PhaseIdealLoop::skeleton_predicate_has_opaque after JDK-8289127
  • 673b505: 8293816: CI: ciBytecodeStream::get_klass() is not consistent
  • 6882bd3: 8293044: C1: Missing access check on non-accessible class
  • ... and 63 more: https://git.openjdk.org/jdk17u-dev/compare/8c5cb310e3d355c85a200235d8dc0db58b9e1a05...master

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

mlbridge bot commented Sep 21, 2022

Webrevs

@zzambers
Copy link
Contributor Author

/integrate

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

openjdk bot commented Sep 27, 2022

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

@GoeLin
Copy link
Member

GoeLin commented Nov 2, 2022

Pre-submit failure: infra issue

@GoeLin
Copy link
Member

GoeLin commented Nov 2, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 2, 2022

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

  • e609398: 8287011: Improve container information
  • d5fedc5: 8244670: convert clhsdb "whatis" command from javascript to java
  • 5fa5392: 8273578: javax/swing/JMenu/4515762/bug4515762.java fails on macOS 12
  • 0698930: 8295288: Some vm_flags tests associate with a wrong BugID
  • 9fd15d5: 8233648: [TESTBUG] DefaultMenuBarTest.java failing on macos
  • 6a45f75: 8280948: Write a regression test for JDK-4659800
  • aa98d09: 8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong number of class unload events: expected 10 got 4
  • 9732004: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • 8194120: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
  • 5977ce5: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
  • ... and 142 more: https://git.openjdk.org/jdk17u-dev/compare/8c5cb310e3d355c85a200235d8dc0db58b9e1a05...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 2, 2022

@GoeLin @zzambers Pushed as commit eef3c96.

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

@zzambers
Copy link
Contributor Author

zzambers commented Nov 2, 2022

@GoeLin Thank you

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.

2 participants