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

auto merge of #4070 : kparaju/servo/master-mime-sniffer-failing-4046, r=jdm

Browse source 
Fixes #4046

I tested it by:

    ./mach test-wpt --include=XMLHttpRequest > old.log
    # make code changes
    ./mach test-wpt --include=XMLHttpRequest > new.log
    grep panic old.log # SnifferManager panics
    grep panic new.log # No SnifferManager panics
This commit is contained in:
bors-servo 2014-11-23 22:24:34 -07:00
commit 65350bb225
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/net/sniffer_task.rs
View file

@ -31,10 +31,15 @@ impl SnifferManager {
} }
impl SnifferManager { impl SnifferManager {
fn start(&self, next_rx: Sender<LoadResponse>) { fn start(self, next_rx: Sender<LoadResponse>) {
loop { loop {
match self.data_receiver.try_recv() { match self.data_receiver.try_recv() {
Ok(snif_data) => next_rx.send(snif_data), Ok(snif_data) => {
let result = next_rx.send_opt(snif_data);
if result.is_err() {
break;
}
}
Err(Disconnected) => break, Err(Disconnected) => break,
Err(_) => (), Err(_) => (),
} }