diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2016-04-21 00:18:37 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2016-04-23 20:27:58 +0200 |
| commit | 7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3 (patch) | |
| tree | d486c090f3287be1036f2aea0f544b65ec95d43e /components/script/dom/websocket.rs | |
| parent | 305c283602882850be9d39c43b980d0fc0f93a3c (diff) | |
| download | servo-7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3.tar.gz servo-7932ab6ac2646e097a2ef2f76d6e4439fe53bdd3.zip | |
Upgrade to rust-url 1.0 and hyper 0.9
Diffstat (limited to 'components/script/dom/websocket.rs')
| -rw-r--r-- | components/script/dom/websocket.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index e92c7abbcab..08d24e2fbe2 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -210,7 +210,7 @@ impl WebSocket { // Step 2: Disallow https -> ws connections. // Step 3: Potentially block access to some ports. - let port: u16 = resource_url.port_or_default().unwrap(); + let port: u16 = resource_url.port_or_known_default().unwrap(); if BLOCKED_PORTS_LIST.iter().any(|&p| p == port) { return Err(Error::Security); @@ -356,7 +356,7 @@ impl WebSocketMethods for WebSocket { // https://html.spec.whatwg.org/multipage/#dom-websocket-url fn Url(&self) -> DOMString { - DOMString::from(self.url.serialize()) + DOMString::from(self.url.as_str()) } // https://html.spec.whatwg.org/multipage/#dom-websocket-readystate |