diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-11 19:30:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-11 19:30:28 -0500 |
commit | 0c11e8340b26aa86faf9ea40aae253392b338ba3 (patch) | |
tree | c64418a8dc4cc53dcec1766076fa5cf31782fcb3 /components/net/websocket_loader.rs | |
parent | 3fa0dca3a32552a83ae020c57535346d9cdf3bdd (diff) | |
parent | 9deecd793c6859e52c2ce9df7bba28eb3159cb97 (diff) | |
download | servo-0c11e8340b26aa86faf9ea40aae253392b338ba3.tar.gz servo-0c11e8340b26aa86faf9ea40aae253392b338ba3.zip |
Auto merge of #11556 - Manishearth:make-fetch-happen, r=jdm
Make fetch happen
<!-- Please describe your changes on the following line: -->
Moves XHR over to the fetch backend.
Previous PR: https://github.com/servo/servo/pull/114
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors (Will fix later)
<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11556)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net/websocket_loader.rs')
-rw-r--r-- | components/net/websocket_loader.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs index 60d6c8932f6..d748e309d20 100644 --- a/components/net/websocket_loader.rs +++ b/components/net/websocket_loader.rs @@ -43,7 +43,7 @@ fn establish_a_websocket_connection(resource_url: &Url, net_url: (Host, String, request.headers.set(WebSocketProtocol(protocols.clone())); }; - http_loader::set_request_cookies(resource_url.clone(), &mut request.headers, &cookie_jar); + http_loader::set_request_cookies(&resource_url, &mut request.headers, &cookie_jar); let response = try!(request.send()); try!(response.validate()); |