Skip to content

Avoid concatenating responses before writing #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateocabanal wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −28
Open

Avoid concatenating responses before writing #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions tinyhttp-internal/src/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,41 +126,29 @@ impl Response {

#[cfg(not(feature = "async"))]
pub fn send<P: Read + Write>(self, sock: &mut P) {
let line_bytes = self.status_line.as_bytes();
#[cfg(feature = "log")]
log::trace!("res status line: {:#?}", self.status_line);

let mut header_bytes: Vec<u8> = self
.headers
.into_iter()
.flat_map(|(i, j)| [(i + ": ").as_bytes(), (j + "\r\n").as_bytes()].concat())
.collect();
sock.write_all(self.status_line.as_bytes()).unwrap();

header_bytes.extend(b"\r\n");

#[cfg(all(feature = "log", debug_assertions))]
{
log::trace!(
"HEADER AS STR: {}",
String::from_utf8(header_bytes.clone()).unwrap()
);
log::trace!(
"STATUS LINE AS STR: {}",
std::str::from_utf8(line_bytes).unwrap()
);
};
for (key, value) in self.headers {
sock.write_all(key.as_bytes()).unwrap();
sock.write_all(b": ").unwrap();
sock.write_all(value.as_bytes()).unwrap();
sock.write_all(b"\r\n").unwrap();
}

let full_req: &[u8] = &[
line_bytes,
header_bytes.as_slice(),
self.body.as_ref().unwrap_or(&vec![]),
]
.concat();
sock.write_all(b"\r\n").unwrap();

#[cfg(feature = "log")]
log::trace!("size of response: {}", full_req.len());
if let Some(body) = self.body {
#[cfg(feature = "log")]
log::trace!("size of response body: {}", body.len());

sock.write_all(full_req).unwrap();
sock.write_all(&body).unwrap();
} else {
#[cfg(feature = "log")]
log::trace!("size of response body: 0");
}
}

#[cfg(feature = "async")]
Expand Down
Loading