Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade headers, headers-core, and hyper_serde.

Browse source
This commit is contained in:
Josh Matthews 2019-06-12 11:47:08 -04:00
parent 99cf263add
commit b1510d9ad5
25 changed files with 97 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/net/Cargo.toml
View file

@ -23,11 +23,11 @@ devtools_traits = {path = "../devtools_traits"}
embedder_traits = { path = "../embedder_traits" }
flate2 = "1"
futures = "0.1"
headers-core = "0.0.1"
headers-ext = "0.0.3"
headers-core = "0.1"
headers = "0.2"
http = "0.1"
hyper = "0.12"
hyper_serde = "0.9"
hyper_serde = "0.11"
hyper-openssl = "0.7"
immeta = "0.4"
ipc-channel = "0.11"

3
components/net/fetch/methods.rs
View file

@ -10,8 +10,7 @@ use crate::http_loader::{set_default_accept, set_default_accept_language};
use crate::subresource_integrity::is_response_integrity_valid;
use crossbeam_channel::{unbounded, Receiver, Sender};
use devtools_traits::DevtoolsControlMsg;
use headers_core::HeaderMapExt;
use headers_ext::{AccessControlExposeHeaders, ContentType, Range};
use headers::{AccessControlExposeHeaders, ContentType, HeaderMapExt, Range};
use http::header::{self, HeaderMap, HeaderName, HeaderValue};
use hyper::Method;
use hyper::StatusCode;

2
components/net/filemanager_thread.rs
View file

@ -5,7 +5,7 @@
use crate::fetch::methods::{CancellationListener, Data, RangeRequestBounds};
use crossbeam_channel::Sender;
use embedder_traits::{EmbedderMsg, EmbedderProxy, FilterPattern};
use headers_ext::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
use headers::{ContentLength, ContentType, HeaderMap, HeaderMapExt};
use http::header::{self, HeaderValue};
use ipc_channel::ipc::{self, IpcSender};
use mime::{self, Mime};

5
components/net/http_cache.rs
View file

@ -9,8 +9,9 @@
use crate::fetch::methods::{Data, DoneChannel};
use crossbeam_channel::{unbounded, Sender};
use headers_core::HeaderMapExt;
use headers_ext::{CacheControl, ContentRange, Expires, LastModified, Pragma, Range, Vary};
use headers::{
CacheControl, ContentRange, Expires, HeaderMapExt, LastModified, Pragma, Range, Vary,
};
use http::header::HeaderValue;
use http::{header, HeaderMap};
use hyper::{Method, StatusCode};

12
components/net/http_loader.rs
View file

@ -19,15 +19,15 @@ use devtools_traits::{
ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest,
};
use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
use headers_core::HeaderMapExt;
use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders};
use headers_ext::{
use headers::authorization::Basic;
use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, HeaderMapExt};
use headers::{
AccessControlAllowMethods, AccessControlRequestHeaders, AccessControlRequestMethod,
Authorization,
};
use headers_ext::{AccessControlAllowOrigin, AccessControlMaxAge, Basic};
use headers_ext::{CacheControl, ContentEncoding, ContentLength};
use headers_ext::{
use headers::{AccessControlAllowOrigin, AccessControlMaxAge};
use headers::{CacheControl, ContentEncoding, ContentLength};
use headers::{
Host, IfModifiedSince, LastModified, Origin as HyperOrigin, Pragma, Referer, UserAgent,
};
use http::header::{self, HeaderName, HeaderValue};

3
components/net/tests/data_loader.rs
View file

@ -3,8 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::fetch;
use headers_core::HeaderMapExt;
use headers_ext::ContentType;
use headers::{ContentType, HeaderMapExt};
use hyper_serde::Serde;
use mime::{self, Mime};
use net_traits::request::{Origin, Request};

9
components/net/tests/fetch.rs
View file

@ -12,12 +12,9 @@ use crate::{
use crossbeam_channel::{unbounded, Sender};
use devtools_traits::HttpRequest as DevtoolsHttpRequest;
use devtools_traits::HttpResponse as DevtoolsHttpResponse;
use headers_core::HeaderMapExt;
use headers_ext::{
AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin,
};
use headers_ext::{AccessControlAllowMethods, AccessControlMaxAge};
use headers_ext::{
use headers::{AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin};
use headers::{AccessControlAllowMethods, AccessControlMaxAge, HeaderMapExt};
use headers::{
CacheControl, ContentLength, ContentType, Expires, Host, LastModified, Pragma, UserAgent,
};
use http::header::{self, HeaderMap, HeaderName, HeaderValue};

8
components/net/tests/http_loader.rs
View file

@ -14,11 +14,11 @@ use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEve
use flate2::write::{DeflateEncoder, GzEncoder};
use flate2::Compression;
use futures::{self, Future, Stream};
use headers_core::HeaderMapExt;
use headers_ext::{
AccessControlAllowOrigin, Authorization, Basic, ContentLength, Date, Host, Origin,
use headers::authorization::Basic;
use headers::{
AccessControlAllowOrigin, Authorization, ContentLength, Date, HeaderMapExt, Host, Origin,
StrictTransportSecurity, UserAgent,
};
use headers_ext::{StrictTransportSecurity, UserAgent};
use http::header::{self, HeaderMap, HeaderValue};
use http::uri::Authority;
use http::{Method, StatusCode};

2
components/net/websocket_loader.rs
View file

@ -8,7 +8,7 @@ use crate::fetch::methods::should_be_blocked_due_to_bad_port;
use crate::hosts::replace_host;
use crate::http_loader::HttpState;
use embedder_traits::resources::{self, Resource};
use headers_ext::Host;
use headers::Host;
use http::header::{self, HeaderMap, HeaderName, HeaderValue};
use http::uri::Authority;
use ipc_channel::ipc::{IpcReceiver, IpcSender};