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

1. Add an enum type NetworkEventMessage for handling both HttpRequest and HttpResponse messages

Browse source 
2. Change run_server to handle network events
3. Add a unique id to track request-actor associations
4. Update the network event actor
This commit is contained in:
Himaja 2015-04-26 20:51:46 -04:00 • committed by Josh Matthews
parent 9f4a88bc48
commit 6e91ebb1fe
5 changed files with 230 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/net/http_loader.rs
View file

@ -4,7 +4,7 @@
use net_traits::{ControlMsg, CookieSource, LoadData, Metadata, LoadConsumer};
use net_traits::ProgressMsg::{Payload, Done};
use devtools_traits::{DevtoolsControlMsg};
use devtools_traits::{DevtoolsControlMsg, NetworkEvent};
use mime_classifier::MIMEClassifier;
use resource_task::{start_sending_opt, start_sending_sniffed_opt};
@ -29,6 +29,7 @@ use util::resource_files::resources_dir_path;
use util::opts;
use url::{Url, UrlParser};
use uuid;
use std::borrow::ToOwned;
use std::boxed::FnBox;
@ -199,16 +200,14 @@ reason: \"certificate verify failed\" }]))";
info!("{:?}", load_data.data);
}
/*
match devtools_chan {
Some(chan) => chan.send(DevtoolsControlMsg::HttpRequest(load_data.url.clone(), load_data.method.clone(), load_data.headers.clone(), load_data.data.clone())).unwrap(),
None => {}
}
*/
println!("load");
devtools_chan.as_ref().map(|chan| chan.send(DevtoolsControlMsg::HttpRequest(load_data.url.clone(), load_data.method.clone(), load_data.headers.clone(), load_data.data.clone())).unwrap());
let request_id = uuid::Uuid::new_v4().to_simple_string();
let net_event = NetworkEvent::HttpRequest(
load_data.url.clone(),
load_data.method.clone(),
load_data.headers.clone(),
load_data.data.clone()
);
devtools_chan.as_ref().map(|chan| chan.send(DevtoolsControlMsg::NetworkEventMessage(request_id.clone(), net_event)));
// Avoid automatically sending request body if a redirect has occurred.
let writer = match load_data.data {
@ -342,6 +341,10 @@ reason: \"certificate verify failed\" }]))";
}
}
println!("Http loader Response");
let net_event_response = NetworkEvent::HttpResponse(metadata.headers.clone(), metadata.status.clone(), None);
devtools_chan.as_ref().map(|chan| chan.send(DevtoolsControlMsg::NetworkEventMessage(request_id, net_event_response)));
match encoding_str {
Some(encoding) => {
if encoding == "gzip" {