2 Commits

Author	SHA1	Message	Date
Simon Sapin	b7019c2535	servo: Merge #9840 - Update to rust-url 1.0 (from servo:url-1.0); r=asajeffrey ... **Do not merge yet:** rust-url 1.0 is not published yet and may still get breaking changes. The goal of this PR for now is to demonstrate API usage. Depends on: * <s>https://github.com/servo/rust-url/pull/176</s> * <s>https://github.com/alexcrichton/cookie-rs/pull/42</s> * <s>https://github.com/hyperium/hyper/pull/740</s> * https://github.com/cyderize/rust-websocket/pull/70 * https://github.com/jgraham/webdriver-rust/pull/28 Source-Repo: https://github.com/servo/servo Source-Revision: 84ab7e9fe8f4a6528995eff3eb6e814cb724c364	2016-04-23 11:28:31 -07:00
Josh Matthews	334df4c358	servo: Merge #9942 - Moving the error handling out of network loader (from jdm:load_error); r=ms2ger ... Rebase of #8851. Fixes #8678. Fixes #9944. Source-Repo: https://github.com/servo/servo Source-Revision: f051028ee8cd93168b1abe3742929d43d19cb002	2016-04-20 21:49:22 +05:00