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

8211227: Inconsistent TLS protocol version in debug output #332

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 13, 2021

Almost clean backport of JDK-8211227. Test LoggingFormatConsistency needs workaround for missing JDK-8230435 in 11u: serverAddress is not defined.


Progress

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

Issue

  • JDK-8211227: Inconsistent TLS protocol version in debug output

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 332

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 13, 2021

👋 Welcome back mdoerr! 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 a86728850e9919d2bbeeef70093adbd87bc3bb26 8211227: Inconsistent TLS protocol version in debug output Sep 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

@openjdk openjdk bot added backport rfr labels Sep 13, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 13, 2021

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

LGTM.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 14, 2021

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

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

8211227: Inconsistent TLS protocol version in debug output

Reviewed-by: sgehwolf

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

  • 74eed68: 8228442: DHKeyExchange/LegacyDHEKeyExchange.java failed due to "SSLException: An established connection was aborted by the software in your host machine"
  • 4af62d8: 8250863: Build error with GCC 10 in NetworkInterface.c and k_standard.c
  • 1868c15: 8237354: Add option to jcmd to write a gzipped heap dump

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 added the ready label Sep 14, 2021
@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Sep 14, 2021

Thanks for the review and the approval!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 14, 2021

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

  • 74eed68: 8228442: DHKeyExchange/LegacyDHEKeyExchange.java failed due to "SSLException: An established connection was aborted by the software in your host machine"
  • 4af62d8: 8250863: Build error with GCC 10 in NetworkInterface.c and k_standard.c
  • 1868c15: 8237354: Add option to jcmd to write a gzipped heap dump

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 14, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 14, 2021

@TheRealMDoerr Pushed as commit 124f3ac.

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

@TheRealMDoerr TheRealMDoerr deleted the 8211227_TLS branch Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants