rust
/
rust-fastcgi
mirror of https://github.com/mohtar/rust-fastcgi
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Maybe fixed a crash due to unwrap

This commit is contained in:
Esption 2015-08-02 01:00:36 -05:00
parent 15d3aed9f2
commit 3800a77a85
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib.rs
View File

@ -414,10 +414,10 @@ impl Request {
loop { loop {
match try!(Record::receive(&mut sock)) { match try!(Record::receive(&mut sock)) {
Record::UnknownType(rec_type) => { Record::UnknownType(rec_type) => {
Record::UnknownType(rec_type).send(&mut sock).unwrap(); Record::UnknownType(rec_type).send(&mut sock).unwrap_or(());
}, },
Record::GetValues(keys) => { Record::GetValues(keys) => {
Record::GetValuesResult(get_values(keys)).send(&mut sock).unwrap(); Record::GetValuesResult(get_values(keys)).send(&mut sock).unwrap_or(());
}, },
Record::BeginRequest { request_id, role: Ok(role), keep_conn } => { Record::BeginRequest { request_id, role: Ok(role), keep_conn } => {
return Ok((request_id, role, keep_conn)); return Ok((request_id, role, keep_conn));
@ -470,7 +470,7 @@ impl Request {
continue; continue;
} }
if content.is_empty() { if content.is_empty() {
params.extend(read_pairs(&mut Cursor::new(buf.as_ref())).unwrap()); params.extend(try!(read_pairs(&mut Cursor::new(buf.as_ref()))));
break; break;
} else { } else {
buf.extend(content); buf.extend(content);
@ -547,16 +547,16 @@ impl Drop for Request {
Record::Stdout { Record::Stdout {
request_id: self.id, request_id: self.id,
content: Vec::new(), content: Vec::new(),
}.send(&mut &*self.sock).unwrap(); }.send(&mut &*self.sock).unwrap_or(());
Record::Stderr { Record::Stderr {
request_id: self.id, request_id: self.id,
content: Vec::new() content: Vec::new()
}.send(&mut &*self.sock).unwrap(); }.send(&mut &*self.sock).unwrap_or(());
Record::EndRequest { Record::EndRequest {
request_id: self.id, request_id: self.id,
app_status: self.status, app_status: self.status,
protocol_status: ProtocolStatus::RequestComplete, protocol_status: ProtocolStatus::RequestComplete,
}.send(&mut &*self.sock).unwrap(); }.send(&mut &*self.sock).unwrap_or(());
} }
} }
@ -571,8 +571,12 @@ fn run_transport<F>(mut handler: F, transport: &mut Transport) where F: FnMut(Re
Ok(sock) => sock, Ok(sock) => sock,
Err(e) => panic!(e.to_string()), Err(e) => panic!(e.to_string()),
}; };
let t = match sock.peer() {
Ok(e) => e,
Err(_) => return
};
let allow = match addrs { let allow = match addrs {
Some(ref addrs) => addrs.contains(&sock.peer().unwrap()), Some(ref addrs) => addrs.contains(&t),
None => true, None => true,
}; };
if allow { if allow {