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

Add note pointing out that WebSocket does not implement SOP #6158

Merged
merged 2 commits into from May 17, 2016

Conversation

Projects
None yet
3 participants
@wsargent
Copy link
Member

commented May 15, 2016

No description provided.

@@ -47,6 +47,9 @@ Sometimes you may wish to reject a WebSocket request, for example, if the user m

@[actor-reject](code/javaguide/async/JavaWebSockets.java)

> **Note**: the WebSocket protocol does not implement [Same Origin Policy](https://en.wikipedia.org/wiki/Same-origin_policy), and so does not protect against [

This comment has been minimized.

Copy link
@gmethvin

gmethvin May 16, 2016

Member

Should the newline after the [ be here?

@@ -49,6 +49,9 @@ Sometimes you may wish to reject a WebSocket request, for example, if the user m

@[actor-try-accept](code/ScalaWebSockets.scala)

> **Note**: the WebSocket protocol does not implement [Same Origin Policy](https://en.wikipedia.org/wiki/Same-origin_policy), and so does not protect against [

This comment has been minimized.

Copy link
@gmethvin

gmethvin May 16, 2016

Member

same issue here

@wsargent

This comment has been minimized.

Copy link
Member Author

commented May 16, 2016

@gmethvin good catch, removed newline.

@gmethvin gmethvin merged commit 8107c4e into playframework:master May 17, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
typesafe-cla-validator All users have signed the CLA
Details

gmethvin added a commit that referenced this pull request May 17, 2016

@wsargent wsargent deleted the wsargent:document-websocket-origin branch May 17, 2016

@mkurz mkurz added this to the 2.5.4 milestone Jun 2, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.