Auto merge of #6634 - Ms2ger:ws-parse, r=metajack

Remove parse_web_socket_url in favour of functions in rust-websocket.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6634)
<!-- Reviewable:end -->

components/script/dom/websocket.rs

@@ -25,6 +25,7 @@ use std::cell::{Cell, RefCell};
 use std::borrow::ToOwned;
 use util::str::DOMString;
 
+use hyper::header::Host;
 use websocket::Message;
 use websocket::ws::sender::Sender as Sender_Object;
 use websocket::client::sender::Sender;
@@ -34,6 +35,7 @@ use websocket::client::request::Url;
 use websocket::Client;
 use websocket::header::Origin;
 use websocket::result::WebSocketResult;
+use websocket::ws::util::url::parse_url;
 
 #[derive(JSTraceable, PartialEq, Copy, Clone)]
 enum WebSocketRequestState {
@@ -63,47 +65,8 @@ pub struct WebSocket {
     sendCloseFrame: Cell<bool>
 }
 
-fn parse_web_socket_url(url_str: &str) -> Fallible<(Url, String, u16, String, bool)> {
-    // https://html.spec.whatwg.org/multipage/#parse-a-websocket-url's-components
-    // Steps 1 and 2
-    let parsed_url = Url::parse(url_str);
-    let parsed_url = match parsed_url {
-        Ok(parsed_url) => parsed_url,
-        Err(_) => return Err(Error::Syntax),
-    };
-
-    // Step 4
-    if parsed_url.fragment != None {
-        return Err(Error::Syntax);
-    }
-
-    // Steps 3 and 5
-    let secure = match parsed_url.scheme.as_ref() {
-        "ws" => false,
-        "wss" => true,
-        _ => return Err(Error::Syntax), // step 3
-    };
-
-    let host = parsed_url.host().unwrap().serialize(); // Step 6
-    let port = parsed_url.port_or_default().unwrap(); // Steps 7 and 8
-    let mut resource = parsed_url.path().unwrap().connect("/"); // Step 9
-    if resource.is_empty() {
-        resource = "/".to_owned(); // Step 10
-    }
-
-    // Step 11
-    if let Some(ref query) = parsed_url.query {
-        resource.push('?');
-        resource.push_str(query);
-    }
-
-    // Step 12
-    // FIXME remove parsed_url once it's no longer used in WebSocket::new
-    Ok((parsed_url, host, port, resource, secure))
-}
-
 /// *Establish a WebSocket Connection* as defined in RFC 6455.
-fn establish_a_websocket_connection(url: Url, origin: String)
+fn establish_a_websocket_connection(url: (Host, String, bool), origin: String)
     -> WebSocketResult<(Sender<WebSocketStream>, Receiver<WebSocketStream>)> {
     let mut request = try!(Client::connect(url));
     request.headers.set(Origin(origin));
@@ -137,9 +100,8 @@ impl WebSocket {
 
     pub fn new(global: GlobalRef, url: DOMString) -> Fallible<Root<WebSocket>> {
         // Step 1.
-        // FIXME extract the right variables once Client::connect
-        // implementation is fixed to follow the RFC 6455 properly.
-        let (url, _, _, _, _) = try!(parse_web_socket_url(&url));
+        let parsed_url = try!(Url::parse(&url).map_err(|_| Error::Syntax));
+        let url = try!(parse_url(&parsed_url).map_err(|_| Error::Syntax));
 
         /*TODO: This constructor is only a prototype, it does not accomplish the specs
           defined here:
@@ -148,7 +110,7 @@ impl WebSocket {
           TODO: This constructor should be responsible for spawning a thread for the
           receive loop after ws.r().Open() - See comment
         */
-        let ws = reflect_dom_object(box WebSocket::new_inherited(global, url.clone()),
+        let ws = reflect_dom_object(box WebSocket::new_inherited(global, parsed_url),
                                     global,
                                     WebSocketBinding::Wrap);