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

8310731: Configure a javax.net.ssl.SNIMatcher for the HTTP/1.1 test servers in java/net/httpclient tests #14626

Closed
wants to merge 1 commit into from

Conversation

jaikiran
Copy link
Member

@jaikiran jaikiran commented Jun 23, 2023

Can I please get a review of this test-only change which addresses https://bugs.openjdk.org/browse/JDK-8310731?

As noted in that issue, before the changes in this PR, the test servers that we created for HTTP/1.1 testing in java/net/httpclient tests weren't configured to use a javax.net.ssl.SNIMatcher which resulted in the SNI name extension from the client being ignored. The commit in this PR addresses that by configuring such instances with a relevant SNIMatcher.

No new tests have been added given the nature of this change, but existing tests in java/net/httpclient continue to pass with this change.


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

Issue

  • JDK-8310731: Configure a javax.net.ssl.SNIMatcher for the HTTP/1.1 test servers in java/net/httpclient tests (Task - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14626/head:pull/14626
$ git checkout pull/14626

Update a local copy of the PR:
$ git checkout pull/14626
$ git pull https://git.openjdk.org/jdk.git pull/14626/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14626

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14626.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 23, 2023

👋 Welcome back jpai! 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 added the rfr Pull request is ready for review label Jun 23, 2023
@openjdk
Copy link

openjdk bot commented Jun 23, 2023

@jaikiran The following label will be automatically applied to this pull request:

  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the net net-dev@openjdk.org label Jun 23, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 23, 2023

Webrevs

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for this change Jaikiran!

@openjdk
Copy link

openjdk bot commented Jun 27, 2023

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

8310731: Configure a javax.net.ssl.SNIMatcher for the HTTP/1.1 test servers in java/net/httpclient tests

Reviewed-by: dfuchs

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

  • 1587836: 8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null
  • 73d7aa1: 8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
  • 990e3a7: 8308899: Introduce Classfile context and improve Classfile options
  • 79c056e: 8006421: GraphicsConfiguration of a frame is changed when the frame is moved to another screen
  • 45b581b: 8309583: AArch64: Optimize firstTrue() when amount of elements < 8
  • 87e6fab: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 39fa4e6: 8310489: New test runtime/ClassInitErrors/TestStackOverflowDuringInit.java failed
  • 46add3f: 8310909: java.io.InvalidObjectException has redundant @since tag
  • 8f5b677: 8310908: Non-standard @since tag in com.sun.java.accessibility.util.package-info
  • a197ee7: 8310838: Correct range notations in MethodTypeDesc specification
  • ... and 35 more: https://git.openjdk.org/jdk/compare/d1d2b55ce0b950e07f6e3761983f73fd58079627...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.

➡️ 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 Pull request is ready to be integrated label Jun 27, 2023
@jaikiran
Copy link
Member Author

Thank you Daniel for the review.

@jaikiran
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 27, 2023

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

  • 1587836: 8310425: [JVMCI] compiler/runtime/TestConstantDynamic: lookupConstant returned an object of incorrect type: null
  • 73d7aa1: 8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
  • 990e3a7: 8308899: Introduce Classfile context and improve Classfile options
  • 79c056e: 8006421: GraphicsConfiguration of a frame is changed when the frame is moved to another screen
  • 45b581b: 8309583: AArch64: Optimize firstTrue() when amount of elements < 8
  • 87e6fab: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 39fa4e6: 8310489: New test runtime/ClassInitErrors/TestStackOverflowDuringInit.java failed
  • 46add3f: 8310909: java.io.InvalidObjectException has redundant @since tag
  • 8f5b677: 8310908: Non-standard @since tag in com.sun.java.accessibility.util.package-info
  • a197ee7: 8310838: Correct range notations in MethodTypeDesc specification
  • ... and 35 more: https://git.openjdk.org/jdk/compare/d1d2b55ce0b950e07f6e3761983f73fd58079627...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 27, 2023
@openjdk openjdk bot closed this Jun 27, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 27, 2023
@openjdk
Copy link

openjdk bot commented Jun 27, 2023

@jaikiran Pushed as commit 05e9c41.

💡 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
integrated Pull request has been integrated net net-dev@openjdk.org
2 participants