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

8276774: Cookie stored in CookieHandler not sent if user headers contain cookie #18

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Nov 30, 2021

Almost clean Backport of JDK-8276774. One hunk in Stream.java required manual integration because the switch expression doesn't exist in 11u. The test needed adaptations because SimpleSSLContext is located at a different place in 11u and Stream.toList() is unavailable (see 2nd commit).


Progress

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

Issue

  • JDK-8276774: Cookie stored in CookieHandler not sent if user headers contain cookie

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 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 03debf277537135974d3f55e3a5c7cf6842ee5e0 8276774: Cookie stored in CookieHandler not sent if user headers contain cookie Nov 30, 2021
@openjdk
Copy link

openjdk bot commented Nov 30, 2021

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 30, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2021

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger left a comment

This backport looks correct to me. Thanks for doing it!

@openjdk
Copy link

openjdk bot commented Dec 1, 2021

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

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

8276774: Cookie stored in CookieHandler not sent if user headers contain cookie

Reviewed-by: clanger, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Dec 1, 2021
dfuch
dfuch approved these changes Dec 1, 2021
Copy link
Member

@dfuch dfuch left a comment

LGTM

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Dec 1, 2021

Thanks for the reviews!

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Dec 2, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Dec 2, 2021

Going to push as commit 8fe5d59.

@openjdk openjdk bot closed this Dec 2, 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 labels Dec 2, 2021
@openjdk
Copy link

openjdk bot commented Dec 2, 2021

@TheRealMDoerr Pushed as commit 8fe5d59.

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

@TheRealMDoerr TheRealMDoerr deleted the 8276774_http_Cookie branch Dec 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants