diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-08-22 15:53:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-22 15:53:26 -0400 |
commit | aac4a3485f1080b43485a4349cbcdfd9bae09767 (patch) | |
tree | 65046195a031fef99ffdac281192e8247840b95e /components/script/dom/websocket.rs | |
parent | 73df3ad2ea27c562311993599e1af9f9b4232ee9 (diff) | |
parent | a1925aab52bee832e67c8178df6144ec38fa1845 (diff) | |
download | servo-aac4a3485f1080b43485a4349cbcdfd9bae09767.tar.gz servo-aac4a3485f1080b43485a4349cbcdfd9bae09767.zip |
Auto merge of #21430 - Eijebong:ws-origin, r=jdm
Properly set the origin on websocket messages
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21430)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 14ff325f56d..2de8f97d98e 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -33,7 +33,7 @@ use net_traits::request::{RequestInit, RequestMode}; use profile_traits::ipc as ProfiledIpc; use script_runtime::CommonScriptMsg; use script_runtime::ScriptThreadEventCategory::WebSocketEvent; -use servo_url::ServoUrl; +use servo_url::{ImmutableOrigin, ServoUrl}; use std::borrow::ToOwned; use std::cell::Cell; use std::ptr; @@ -274,6 +274,10 @@ impl WebSocket { Ok(true) } + + pub fn origin(&self) -> ImmutableOrigin { + self.url.origin() + } } impl WebSocketMethods for WebSocket { @@ -549,7 +553,12 @@ impl TaskOnce for MessageReceivedTask { } }, } - MessageEvent::dispatch_jsval(ws.upcast(), &global, message.handle()); + MessageEvent::dispatch_jsval( + ws.upcast(), + &global, + message.handle(), + Some(&ws.origin().ascii_serialization()) + ); } } } |