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

[2.8.x] Escape Content-Disposition params according to WHATWG HTML living standard (backport #11571) by @mkurz #11603

Merged
merged 2 commits into from Jan 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2023

This is an automatic backport of pull request #11571 done by Mergify.
Cherry-pick of 8e787dd has failed:

On branch mergify/bp/2.8.x/pr-11571
Your branch is up to date with 'origin/2.8.x'.

You are currently cherry-picking commit 8e787dd65c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/play-integration-test/src/it/scala/play/it/libs/JavaWSSpec.scala
	modified:   core/play-integration-test/src/it/scala/play/it/libs/ScalaWSSpec.scala
	new file:   core/play-java/src/test/resources/testassets/foo.txt
	modified:   core/play/src/main/java/play/mvc/Http.java
	modified:   core/play/src/main/scala/play/core/formatters/Multipart.scala
	new file:   transport/client/play-ahc-ws/src/test/resources/testassets/foo.txt
	modified:   transport/client/play-ahc-ws/src/test/scala/play/api/libs/ws/ahc/AhcWSSpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/play-java/src/test/java/play/mvc/RequestBuilderTest.java
	both modified:   core/play/src/main/scala/play/api/http/Writeable.scala
	both modified:   core/play/src/test/scala/play/api/http/WriteableSpec.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ndard

(cherry picked from commit 8e787dd)

# Conflicts:
#	core/play-java/src/test/java/play/mvc/RequestBuilderTest.java
#	core/play/src/main/scala/play/api/http/Writeable.scala
#	core/play/src/test/scala/play/api/http/WriteableSpec.scala
@mkurz mkurz force-pushed the mergify/bp/2.8.x/pr-11571 branch 3 times, most recently from 1806493 to b72df0a Compare January 12, 2023 16:46
@mergify mergify bot merged commit f81bc59 into 2.8.x Jan 12, 2023
@mergify mergify bot deleted the mergify/bp/2.8.x/pr-11571 branch January 12, 2023 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant