aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/websocket_loader.rs
diff options
context:
space:
mode:
authorKeith Yeung <kungfukeith11@gmail.com>2017-10-21 06:39:23 -0700
committerKeith Yeung <kungfukeith11@gmail.com>2017-10-23 11:19:35 -0700
commitc6bb1cb9d553c13a20dace3e32b9643c433caa1e (patch)
tree0d0e46e00362136c6c7d62dc76accce9d37e27cc /components/net/websocket_loader.rs
parent48c715c1c86301d0f25e70d3e690d04d8303c58f (diff)
downloadservo-c6bb1cb9d553c13a20dace3e32b9643c433caa1e.tar.gz
servo-c6bb1cb9d553c13a20dace3e32b9643c433caa1e.zip
Merge request type and destination
Diffstat (limited to 'components/net/websocket_loader.rs')
-rw-r--r--components/net/websocket_loader.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index dc4253fb594..3a9345cfac5 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -17,7 +17,7 @@ use hyper::status::StatusCode;
use hyper::version::HttpVersion;
use net_traits::{CookieSource, MessageData, NetworkError, WebSocketCommunicate, WebSocketConnectData};
use net_traits::{WebSocketDomAction, WebSocketNetworkEvent};
-use net_traits::request::{Destination, Type};
+use net_traits::request::Destination;
use servo_url::ServoUrl;
use std::ascii::AsciiExt;
use std::io::{self, Write};
@@ -280,7 +280,7 @@ fn fetch(url: ServoUrl,
// TODO: handle request's origin.
// Step 3.
- set_default_accept(Type::None, Destination::None, &mut headers);
+ set_default_accept(Destination::None, &mut headers);
// Step 4.
set_default_accept_language(&mut headers);
@@ -370,7 +370,7 @@ fn main_fetch(url: ServoUrl,
// TODO: handle blocking as mixed content.
// TODO: handle blocking by content security policy.
// Not applicable: blocking due to MIME type matters only for scripts.
- if should_be_blocked_due_to_nosniff(Type::None, &headers) {
+ if should_be_blocked_due_to_nosniff(Destination::None, &headers) {
response = Err(NetworkError::Internal("Request should be blocked due to nosniff.".into()));
}
}