diff options
| author | Bastien Orivel <eijebong@bananium.fr> | 2018-08-27 18:36:52 +0200 |
|---|---|---|
| committer | Bastien Orivel <eijebong@bananium.fr> | 2018-11-01 19:17:36 +0100 |
| commit | 024b40b39d3848f1a1f7020bd7ed8c901817f09c (patch) | |
| tree | 27508f102b0973cbae3dca22143ea4aedd349f4b /components/net_traits/request.rs | |
| parent | 95bfaa0a770479fb3bf6bf0b1f85c9ae343e66ff (diff) | |
| download | servo-024b40b39d3848f1a1f7020bd7ed8c901817f09c.tar.gz servo-024b40b39d3848f1a1f7020bd7ed8c901817f09c.zip | |
Update hyper to 0.12
Diffstat (limited to 'components/net_traits/request.rs')
| -rw-r--r-- | components/net_traits/request.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index 822a39ee324..4113037a672 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use ReferrerPolicy; -use hyper::header::Headers; -use hyper::method::Method; +use http::HeaderMap; +use hyper::Method; use msg::constellation_msg::PipelineId; use servo_url::{ImmutableOrigin, ServoUrl}; use std::default::Default; @@ -145,7 +145,7 @@ pub struct RequestInit { #[serde(deserialize_with = "::hyper_serde::deserialize", serialize_with = "::hyper_serde::serialize")] #[ignore_malloc_size_of = "Defined in hyper"] - pub headers: Headers, + pub headers: HeaderMap, pub unsafe_request: bool, pub body: Option<Vec<u8>>, pub service_workers_mode: ServiceWorkersMode, @@ -171,9 +171,9 @@ pub struct RequestInit { impl Default for RequestInit { fn default() -> RequestInit { RequestInit { - method: Method::Get, + method: Method::GET, url: ServoUrl::parse("about:blank").unwrap(), - headers: Headers::new(), + headers: HeaderMap::new(), unsafe_request: false, body: None, service_workers_mode: ServiceWorkersMode::All, @@ -208,7 +208,7 @@ pub struct Request { pub sandboxed_storage_area_urls: bool, /// <https://fetch.spec.whatwg.org/#concept-request-header-list> #[ignore_malloc_size_of = "Defined in hyper"] - pub headers: Headers, + pub headers: HeaderMap, /// <https://fetch.spec.whatwg.org/#unsafe-request-flag> pub unsafe_request: bool, /// <https://fetch.spec.whatwg.org/#concept-request-body> @@ -264,10 +264,10 @@ impl Request { pipeline_id: Option<PipelineId>) -> Request { Request { - method: Method::Get, + method: Method::GET, local_urls_only: false, sandboxed_storage_area_urls: false, - headers: Headers::new(), + headers: HeaderMap::new(), unsafe_request: false, body: None, window: Window::Client, |