YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_http: bencoded response with content-length

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-02 13:45:56 +02:00
parent a487347a0d
commit 6b1f11635b
6 changed files with 126 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
aquatic_http/src/lib/network/connection.rs
View file

@ -160,14 +160,17 @@ impl EstablishedConnection {
request
}
pub fn send_response(&mut self, body: &str) -> ::std::io::Result<()> {
let mut response = String::new();
pub fn send_response(&mut self, body: &[u8]) -> ::std::io::Result<()> {
let mut response = Vec::new();
response.push_str("HTTP/1.1 200 OK\r\n\r\n"); // FIXME: content-length
response.push_str(body);
response.push_str("\r\n");
response.extend_from_slice(b"HTTP/1.1 200 OK\r\n");
response.extend_from_slice(b"Content-Length: ");
response.extend_from_slice(format!("{}", body.len() + 2).as_bytes());
response.extend_from_slice(b"\r\n\r\n");
response.extend_from_slice(body);
response.extend_from_slice(b"\r\n");
self.stream.write(response.as_bytes())?;
self.stream.write(&response)?;
self.stream.flush()?;
Ok(())

2
aquatic_http/src/lib/network/mod.rs
View file

@ -249,7 +249,7 @@ pub fn send_responses(
continue;
}
match established.send_response(&response.to_http_string()){
match established.send_response(&response.to_bytes()){
Ok(()) => {
debug!("sent response");

4
aquatic_http/src/lib/protocol/mod.rs
View file

@ -169,7 +169,7 @@ pub enum Response {
impl Response {
pub fn to_http_string(self) -> String {
"(response)".to_string()
pub fn to_bytes(self) -> Vec<u8> {
bendy::serde::to_bytes(&self).unwrap()
}
}