vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from ids1024/curl

Browse Source 
tcpd: fix bug in partial reads that was breaking https in curl
This commit is contained in:
Jeremy Soller
2017-06-22 16:29:54 -06:00
committed by GitHub
parent c61ebc269e 20793828c4
commit dc1cd969cd
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tcpd/main.rs
+8 -6
View File
@@ -316,13 +316,15 @@ impl Tcpd {
while ! handle.todo_read.is_empty() && (! handle.data.is_empty() || handle.read_closed()) {
let (_timeout, mut packet) = handle.todo_read.pop_front().unwrap();
let buf = unsafe { slice::from_raw_parts_mut(packet.c as *mut u8, packet.d) };
if let Some((_ip, tcp)) = handle.data.pop_front() {
let mut i = 0;
while i < buf.len() && i < tcp.data.len() {
buf[i] = tcp.data[i];
i += 1;
if let Some((ip, mut tcp)) = handle.data.pop_front() {
let len = std::cmp::min(buf.len(), tcp.data.len());
for (i, c) in tcp.data.drain(0..len).enumerate() {
buf[i] = c;
}
packet.a = i;
if !tcp.data.is_empty() {
handle.data.push_front((ip, tcp));
}
packet.a = len;
} else {
packet.a = 0;
}