Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Redesign network response decoding to avoid creating decoders before some content is present.

Browse source
This commit is contained in:
Josh Matthews 2018-12-21 19:01:47 -05:00
parent 2cf9a00c99
commit 6404a0ef53
11 changed files with 12998 additions and 12606 deletions
Download patch file Download diff file Expand all files Collapse all files

61
components/net/http_loader.rs
View file

@ -2,9 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use crate::connector::{create_http_client, Connector, WrappedBody, BUF_SIZE};
use crate::connector::{create_http_client, Connector};
use crate::cookie;
use crate::cookie_storage::CookieStorage;
use crate::decoder::Decoder;
use crate::fetch::cors_cache::CorsCache;
use crate::fetch::methods::{
is_cors_safelisted_method, is_cors_safelisted_request_header, main_fetch,
@ -13,14 +14,11 @@ use crate::fetch::methods::{Data, DoneChannel, FetchContext, Target};
use crate::hsts::HstsList;
use crate::http_cache::HttpCache;
use crate::resource_thread::AuthCache;
use brotli::Decompressor;
use bytes::Bytes;
use crossbeam_channel::{unbounded, Sender};
use devtools_traits::{
ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest,
};
use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
use flate2::read::{DeflateDecoder, GzDecoder};
use headers_core::HeaderMapExt;
use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders};
use headers_ext::{
@ -49,7 +47,6 @@ use openssl::ssl::SslConnectorBuilder;
use servo_url::{ImmutableOrigin, ServoUrl};
use std::collections::{HashMap, HashSet};
use std::error::Error;
use std::io::Cursor;
use std::iter::FromIterator;
use std::mem;
use std::ops::Deref;
@ -71,7 +68,7 @@ pub struct HttpState {
pub http_cache: RwLock<HttpCache>,
pub auth_cache: RwLock<AuthCache>,
pub history_states: RwLock<HashMap<HistoryStateId, Vec<u8>>>,
pub client: Client<Connector, WrappedBody>,
pub client: Client<Connector, Body>,
}
impl HttpState {
@ -266,31 +263,6 @@ fn set_cookies_from_headers(
}
}
impl Decoder {
fn from_http_response(response: &HyperResponse<Body>) -> Decoder {
if let Some(encoding) = response.headers().typed_get::<ContentEncoding>() {
if encoding.contains("gzip") {
Decoder::Gzip(None)
} else if encoding.contains("deflate") {
Decoder::Deflate(DeflateDecoder::new(Cursor::new(Bytes::new())))
} else if encoding.contains("br") {
Decoder::Brotli(Decompressor::new(Cursor::new(Bytes::new()), BUF_SIZE))
} else {
Decoder::Plain
}
} else {
Decoder::Plain
}
}
}
pub enum Decoder {
Gzip(Option<GzDecoder<Cursor<Bytes>>>),
Deflate(DeflateDecoder<Cursor<Bytes>>),
Brotli(Decompressor<Cursor<Bytes>>),
Plain,
}
fn prepare_devtools_request(
request_id: String,
url: ServoUrl,
@ -367,7 +339,7 @@ fn auth_from_cache(
}
fn obtain_response(
client: &Client<Connector, WrappedBody>,
client: &Client<Connector, Body>,
url: &ServoUrl,
method: &Method,
request_headers: &HeaderMap,
@ -379,10 +351,7 @@ fn obtain_response(
is_xhr: bool,
) -> Box<
dyn Future<
Item = (
HyperResponse<WrappedBody>,
Option<ChromeToDevtoolsControlMsg>,
),
Item = (HyperResponse<Decoder>, Option<ChromeToDevtoolsControlMsg>),
Error = NetworkError,
>,
> {
@ -423,7 +392,7 @@ fn obtain_response(
.replace("{", "%7B")
.replace("}", "%7D"),
)
.body(WrappedBody::new(request_body.clone().into()));
.body(request_body.clone().into());
let mut request = match request {
Ok(request) => request,
@ -474,11 +443,7 @@ fn obtain_response(
debug!("Not notifying devtools (no request_id)");
None
};
let decoder = Decoder::from_http_response(&res);
Ok((
res.map(move |r| WrappedBody::new_with_decoder(r, decoder)),
msg,
))
Ok((Decoder::detect(res), msg))
})
.map_err(move |e| NetworkError::from_hyper_error(&e)),
)
@ -1265,6 +1230,7 @@ fn http_network_fetch(
}
*res_body.lock().unwrap() = ResponseBody::Receiving(vec![]);
let res_body2 = res_body.clone();
if let Some(ref sender) = devtools_sender {
if let Some(m) = msg {
@ -1285,6 +1251,7 @@ fn http_network_fetch(
}
let done_sender2 = done_sender.clone();
let done_sender3 = done_sender.clone();
HANDLE.lock().unwrap().spawn(
res.into_body()
.map_err(|_| ())
@ -1311,7 +1278,15 @@ fn http_network_fetch(
let _ = done_sender2.send(Data::Done);
future::ok(())
})
.map_err(|_| ()),
.map_err(move |_| {
let mut body = res_body2.lock().unwrap();
let completed_body = match *body {
ResponseBody::Receiving(ref mut body) => mem::replace(body, vec![]),
_ => vec![],
};
*body = ResponseBody::Done(completed_body);
let _ = done_sender3.send(Data::Done);
}),
);
// TODO these substeps aren't possible yet