aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-10-13 17:25:27 -0600
committerbors-servo <metajack+bors@gmail.com>2015-10-13 17:25:27 -0600
commit26902a9a9b9266d7ffe13e9e1eb2c70fb0b70ae9 (patch)
tree6d61b70c786aac5ad8a8a543e933c4ee11d19714 /components/script/dom/websocket.rs
parentbc58cd2de05b371f641051eb1038cd29e36bbb01 (diff)
parent61fa1e44400405ca733466101354993ef16b844d (diff)
downloadservo-26902a9a9b9266d7ffe13e9e1eb2c70fb0b70ae9.tar.gz
servo-26902a9a9b9266d7ffe13e9e1eb2c70fb0b70ae9.zip
Auto merge of #7871 - psdh:sendReason, r=jdm
Send reason in the Websocket close handshake Fixes #7862 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7871) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index a04b64ded41..c348efc88d0 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -39,6 +39,7 @@ use websocket::client::receiver::Receiver;
use websocket::client::request::Url;
use websocket::client::sender::Sender;
use websocket::header::Origin;
+use websocket::message::CloseData;
use websocket::result::WebSocketResult;
use websocket::stream::WebSocketStream;
use websocket::ws::receiver::Receiver as WSReceiver;
@@ -358,7 +359,9 @@ impl WebSocketMethods for WebSocket {
let mut sender = this.sender.borrow_mut();
//TODO: Also check if the buffer is full
if let Some(sender) = sender.as_mut() {
- let _ = sender.lock().unwrap().send_message(Message::Close(None));
+ let code: u16 = this.code.get();
+ let reason = this.reason.borrow().clone();
+ let _ = sender.lock().unwrap().send_message(Message::Close(Some(CloseData::new(code, reason))));
}
}