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

Auto merge of #22808 - servo:jdm-patch-10, r=asajeffrey

Browse source 
Avoid locking network timing data unnecessarily.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22808)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-03-06 18:57:35 -05:00 • committed by GitHub
commit 008368fa67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/net/http_loader.rs
View file

@ -618,8 +618,7 @@ pub fn http_fetch(
request.redirect_count as u16, request.redirect_count as u16,
)); ));
let timing = &*context.timing.lock().unwrap(); response.resource_timing = context.timing.lock().unwrap().clone();
response.resource_timing = timing.clone();
// Step 6 // Step 6
response response
@ -1207,8 +1206,8 @@ fn http_network_fetch(
} }
} }
let timing = &*context.timing.lock().unwrap(); let timing = context.timing.lock().unwrap().clone();
let mut response = Response::new(url.clone(), timing.clone()); let mut response = Response::new(url.clone(), timing);
response.status = Some(( response.status = Some((
res.status(), res.status(),
res.status().canonical_reason().unwrap_or("").into(), res.status().canonical_reason().unwrap_or("").into(),