mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Auto merge of #6611 - jdm:websocketorigin, r=jdm
Add Origin header to WebSocket connections. Closes #6532. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6611) <!-- Reviewable:end -->
This commit is contained in:
commit
0fb9f22ff7
9 changed files with 29 additions and 11 deletions
|
@ -32,6 +32,7 @@ use websocket::client::receiver::Receiver;
|
|||
use websocket::stream::WebSocketStream;
|
||||
use websocket::client::request::Url;
|
||||
use websocket::Client;
|
||||
use websocket::header::Origin;
|
||||
|
||||
#[derive(JSTraceable, PartialEq, Copy, Clone)]
|
||||
enum WebSocketRequestState {
|
||||
|
@ -139,7 +140,7 @@ impl WebSocket {
|
|||
|
||||
// TODO Client::connect does not conform to RFC 6455
|
||||
// see https://github.com/cyderize/rust-websocket/issues/38
|
||||
let request = match Client::connect(url) {
|
||||
let mut request = match Client::connect(url) {
|
||||
Ok(request) => request,
|
||||
Err(_) => {
|
||||
let global_root = ws.r().global.root();
|
||||
|
@ -149,6 +150,7 @@ impl WebSocket {
|
|||
return Ok(ws);
|
||||
}
|
||||
};
|
||||
request.headers.set(Origin(global.get_url().serialize()));
|
||||
let response = request.send().unwrap();
|
||||
response.validate().unwrap();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue