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

Testing cancellation during redirects

Browse source
This commit is contained in:
Ravi Shankar 2015-11-14 03:28:01 +05:30
parent 4f855dc63a
commit afb9b0707b
3 changed files with 125 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/net/http_loader.rs
View file

@ -115,7 +115,10 @@ fn load_for_consumer(load_data: LoadData,
let factory = NetworkHttpRequestFactory {
connector: connector,
};
match load::<WrappedHttpRequest>(load_data, hsts_list, cookie_jar, devtools_chan, &factory, user_agent) {
match load::<WrappedHttpRequest>(load_data, hsts_list,
cookie_jar, devtools_chan,
&factory, user_agent,
&cancel_listener) {
Err(LoadError::UnsupportedScheme(url)) => {
let s = format!("{} request, but we don't support that scheme", &*url.scheme);
send_error(url, s, start_chan)
@ -127,6 +130,7 @@ fn load_for_consumer(load_data: LoadData,
send_error(url, "too many redirects".to_owned(), start_chan)
}
Err(LoadError::Cors(url, msg)) |
Err(LoadError::Cancelled(url, msg)) |
Err(LoadError::InvalidRedirect(url, msg)) |
Err(LoadError::Decoding(url, msg)) => {
send_error(url, msg, start_chan)
@ -143,7 +147,7 @@ fn load_for_consumer(load_data: LoadData,
Err(LoadError::ConnectionAborted(_)) => unreachable!(),
Ok(mut load_response) => {
let metadata = load_response.metadata.clone();
send_data(&mut load_response, start_chan, metadata, classifier, cancel_listener)
send_data(&mut load_response, start_chan, metadata, classifier, &cancel_listener)
}
}
}
@ -291,6 +295,7 @@ pub enum LoadError {
Decoding(Url, String),
MaxRedirects(Url),
ConnectionAborted(String),
Cancelled(Url, String),
}
fn set_default_accept_encoding(headers: &mut Headers) {
@ -516,7 +521,8 @@ pub fn load<A>(load_data: LoadData,
cookie_jar: Arc<RwLock<CookieStorage>>,
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
request_factory: &HttpRequestFactory<R=A>,
user_agent: String)
user_agent: String,
cancel_listener: &CancellationListener)
-> Result<StreamedResponse<A::R>, LoadError> where A: HttpRequest + 'static {
// FIXME: At the time of writing this FIXME, servo didn't have any central
// location for configuration. If you're reading this and such a
@ -531,6 +537,10 @@ pub fn load<A>(load_data: LoadData,
let mut redirected_to = HashSet::new();
let mut method = load_data.method.clone();
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
// If the URL is a view-source scheme then the scheme data contains the
// real URL that should be used for which the source is to be viewed.
// Change our existing URL to that and keep note that we are viewing
@ -558,6 +568,10 @@ pub fn load<A>(load_data: LoadData,
return Err(LoadError::UnsupportedScheme(url));
}
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
info!("requesting {}", url.serialize());
// Avoid automatically preserving request headers when redirects occur.
@ -586,6 +600,10 @@ pub fn load<A>(load_data: LoadData,
let mut req = try!(request_factory.create(url.clone(), method.clone()));
*req.headers_mut() = request_headers.clone();
if cancel_listener.is_cancelled() {
return Err(LoadError::Cancelled(url, "load cancelled".to_owned()));
}
if log_enabled!(log::LogLevel::Info) {
info!("{}", method);
for header in req.headers_mut().iter() {
@ -623,7 +641,7 @@ pub fn load<A>(load_data: LoadData,
method.clone(), request_headers.clone(),
cloned_data, pipeline_id
);
}
}
response = match maybe_response {
Ok(r) => r,
@ -715,7 +733,7 @@ fn send_data<R: Read>(reader: &mut R,
start_chan: LoadConsumer,
metadata: Metadata,
classifier: Arc<MIMEClassifier>,
cancel_listener: CancellationListener) {
cancel_listener: &CancellationListener) {
let (progress_chan, mut chunk) = {
let buf = match read_block(reader) {
Ok(ReadResult::Payload(buf)) => buf,