actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-19 04:15:38 +02:00
Code Issues Releases Wiki Activity

use Binary for writer trait

Browse Source
This commit is contained in:
Nikolay Kim
2018-01-14 13:50:38 -08:00
parent e95c7dfc29
commit 33dbe15760
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/h2writer.rs
View File

@@ -7,7 +7,7 @@ use http::{Version, HttpTryFrom, Response};
use http::header::{HeaderValue, CONNECTION, TRANSFER_ENCODING, DATE, CONTENT_LENGTH};
use helpers;
use body::Body;
use body::{Body, Binary};
use helpers::SharedBytes;
use httprequest::HttpMessage;
use httpresponse::HttpResponse;
@@ -52,7 +52,7 @@ impl H2Writer {
}
}
fn write_to_stream(&mut self) -> Result<WriterState, io::Error> {
fn write_to_stream(&mut self) -> io::Result<WriterState> {
if !self.flags.contains(Flags::STARTED) {
return Ok(WriterState::Done)
}
@@ -115,11 +115,7 @@ impl Writer for H2Writer {
Ok(Async::Ready(()))
}
fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse)
-> Result<WriterState, io::Error>
{
// trace!("Prepare response with status: {:?}", msg.status());
fn start(&mut self, req: &mut HttpMessage, msg: &mut HttpResponse) -> io::Result<WriterState> {
// prepare response
self.flags.insert(Flags::STARTED);
self.encoder = PayloadEncoder::new(self.buffer.clone(), req, msg);
@@ -183,16 +179,16 @@ impl Writer for H2Writer {
}
}
fn write(&mut self, payload: &[u8]) -> Result<WriterState, io::Error> {
fn write(&mut self, payload: Binary) -> io::Result<WriterState> {
self.written = payload.len() as u64;
if !self.flags.contains(Flags::DISCONNECTED) {
if self.flags.contains(Flags::STARTED) {
// TODO: add warning, write after EOF
self.encoder.write(payload)?;
self.encoder.write(payload.as_ref())?;
} else {
// might be response for EXCEPT
self.encoder.get_mut().extend_from_slice(payload)
self.encoder.get_mut().extend_from_slice(payload.as_ref())
}
}
@@ -203,7 +199,7 @@ impl Writer for H2Writer {
}
}
fn write_eof(&mut self) -> Result<WriterState, io::Error> {
fn write_eof(&mut self) -> io::Result<WriterState> {
self.encoder.write_eof()?;
self.flags.insert(Flags::EOF);