Skip to content

8268617: [11u REDO] - WebSocket over authenticating proxy fails with NPE #29

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

Closed
wants to merge 1 commit into from

Conversation

Larry-N
Copy link
Contributor

@Larry-N Larry-N commented Jun 11, 2021

Backport of 8236859: WebSocket over authenticating proxy fails with NPE
The patch doesn't apply cleanly, manually merged AuthenticationFilter.java, HttpResponseImpl.java, corrected @library path and import statement in WebSocketProxyTest.java


Progress

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

Issue

  • JDK-8268617: [11u REDO] - WebSocket over authenticating proxy fails with NPE

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 29

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 11, 2021

👋 Welcome back Larry-N! 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 11, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 11, 2021

Webrevs

@Larry-N Larry-N changed the title 8268617: [REDO] backport to 11u of 8236859: WebSocket over ... 8268617: [REDO] - WebSocket over authenticating proxy fails with NPE Jun 15, 2021
@jerboaa
Copy link
Contributor

jerboaa commented Jun 16, 2021

@Larry-N What has changed in this REDO over the original OpenJDK 11u patch, that avoids the tier2 failures in java/net/httpclient? Has this been tested with tier2?

@dfuch
Copy link
Member

dfuch commented Jun 16, 2021

Some libraries live in a different home in jdk11 - so some @library tags and import statements need to be updated when backporting tests to jdk11. I believe that was overlooked in the original backport attempt. Testing is the key though - because nobody ever remembers where these libraries are supposed to be ;-)

@Larry-N
Copy link
Contributor Author

Larry-N commented Jun 16, 2021

In this REDO @library tag and import were changed in WebSocketProxyTest.java over the original backport.
This change was tested with tier2 on Linux x86-64.

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

LGTM, also ran it through our regression testing.

@Larry-N
Copy link
Contributor Author

Larry-N commented Jun 25, 2021

@RealCLanger thank you for review

@RealCLanger
Copy link
Contributor

@RealCLanger thank you for review

Welcome. I have changed the title in JBS, so I think you must change the PR title as well to get it merged...

@Larry-N Larry-N changed the title 8268617: [REDO] - WebSocket over authenticating proxy fails with NPE 8268617: [11u REDO] - WebSocket over authenticating proxy fails with NPE Jun 28, 2021
@openjdk
Copy link

openjdk bot commented Jun 28, 2021

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

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

8268617: [11u REDO] - WebSocket over authenticating proxy fails with NPE

Reviewed-by: clanger

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

  • b74d798: 8265335: Epsilon: Minor typo in EpsilonElasticTLABDecay description
  • 5a7e7d3: 8265761: Font with missed font family name is not properly printed on Windows
  • f56d1f6: 8266480: Implicit null check optimization does not update control of hoisted memory operation
  • 2c2cc74: 8261496: Shenandoah: reconsider pacing updates memory ordering
  • a092a17: 8266813: Shenandoah: Use shorter instruction sequence for checking if marking in progress
  • 80a72de: 8266018: Shenandoah: fix an incorrect assert
  • a0958a8: 8210959: JShell fails and exits when statement throws an exception whose message contains a '%'.
  • 66d4ee9: 8247421: [TESTBUG] ReturnBlobToWrongHeapTest.java failed allocating blob
  • df587c7: 8264752: SIGFPE crash with option FlightRecorderOptions:threadbuffersize=30M
  • c39f3f7: 8193214: Incorrect annotations.without.processors warnings with JDK 9
  • ... and 19 more: https://git.openjdk.java.net/jdk11u-dev/compare/9dc882645a6eb79e068fcaf018c763d9036d7da2...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. Possible candidates are the reviewers of this PR (@RealCLanger) but any other Committer may sponsor as well.

➡️ 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 the ready Pull request is ready to be integrated label Jun 28, 2021
@Larry-N
Copy link
Contributor Author

Larry-N commented Jun 28, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jun 28, 2021

@Larry-N
Your change (at version d60d6d2) is now ready to be sponsored by a Committer.

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 28, 2021
@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 28, 2021

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

  • b74d798: 8265335: Epsilon: Minor typo in EpsilonElasticTLABDecay description
  • 5a7e7d3: 8265761: Font with missed font family name is not properly printed on Windows
  • f56d1f6: 8266480: Implicit null check optimization does not update control of hoisted memory operation
  • 2c2cc74: 8261496: Shenandoah: reconsider pacing updates memory ordering
  • a092a17: 8266813: Shenandoah: Use shorter instruction sequence for checking if marking in progress
  • 80a72de: 8266018: Shenandoah: fix an incorrect assert
  • a0958a8: 8210959: JShell fails and exits when statement throws an exception whose message contains a '%'.
  • 66d4ee9: 8247421: [TESTBUG] ReturnBlobToWrongHeapTest.java failed allocating blob
  • df587c7: 8264752: SIGFPE crash with option FlightRecorderOptions:threadbuffersize=30M
  • c39f3f7: 8193214: Incorrect annotations.without.processors warnings with JDK 9
  • ... and 19 more: https://git.openjdk.java.net/jdk11u-dev/compare/9dc882645a6eb79e068fcaf018c763d9036d7da2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 28, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and 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 Jun 28, 2021
@openjdk
Copy link

openjdk bot commented Jun 28, 2021

@RealCLanger @Larry-N Pushed as commit 8a40d25.

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

@Larry-N Larry-N deleted the backport-c6da6681 branch July 7, 2021 11:32
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
Development

Successfully merging this pull request may close these issues.

4 participants