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

Fixed #6316 encoding will be applied to asXml #6317

Merged
merged 1 commit into from Jul 12, 2016
Merged

Fixed #6316 encoding will be applied to asXml #6317

merged 1 commit into from Jul 12, 2016

Conversation

schmitch
Copy link
Contributor

Fixes

Fixes #6316

Purpose

Adds the correct content encoding to WSResponse asXml()

@@ -44,6 +41,15 @@ trait WSSpec extends PlaySpecification with ServerIntegrationSpecification {

val foldingSink = Sink.fold[ByteString, ByteString](ByteString.empty)((state, bs) => state ++ bs)

val isoString = {
Copy link
Contributor Author

@schmitch schmitch Jul 12, 2016

Choose a reason for hiding this comment

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

not sure if that works? anybody got a better idea?

At least the test works, even when it's "ugly"

@mkurz
Copy link
Member

mkurz commented Jul 12, 2016

@schmitch The tests you added fail:

[error] x response asXml with correct contentType
[error] 'Hello �' is not equal to 'Hello €' (WSSpec.scala:220)

@marcospereira
Copy link
Member

LGTM.

@gmethvin
Copy link
Member

Thanks @schmitch

@gmethvin gmethvin merged commit d5d648f into playframework:master Jul 12, 2016
@mkurz
Copy link
Member

mkurz commented Jul 13, 2016

Should we backport this?

@schmitch
Copy link
Contributor Author

schmitch commented Jul 13, 2016

actually I already working on the backport (running the tests).

@mkurz mkurz added this to the 2.5.5 milestone Jul 13, 2016
@schmitch schmitch deleted the ws-resonse-as-xml-charset branch July 20, 2016 06:57
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

4 participants