actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-09-01 01:16:59 +02:00
Code Issues Releases Wiki Activity

ClientBody is not needed

Browse Source
This commit is contained in:
Nikolay Kim
2018-06-19 10:15:16 +06:00
parent 362b14c2f7
commit 247e8727cb
7 changed files with 88 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/writer.rs
View File

@@ -19,12 +19,12 @@ use http::{HttpTryFrom, Version};
use time::{self, Duration};
use tokio_io::AsyncWrite;
use body::Binary;
use body::{Binary, Body};
use header::ContentEncoding;
use server::encoding::{ContentEncoder, TransferEncoding};
use server::WriterState;
use client::{ClientBody, ClientRequest};
use client::ClientRequest;
const AVERAGE_HEADER_SIZE: usize = 30;
@@ -133,7 +133,7 @@ impl HttpClientWriter {
).map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
// write headers
if let ClientBody::Binary(ref bytes) = *msg.body() {
if let Body::Binary(ref bytes) = *msg.body() {
self.buffer
.reserve(msg.headers().len() * AVERAGE_HEADER_SIZE + bytes.len());
} else {
@@ -162,7 +162,7 @@ impl HttpClientWriter {
self.headers_size = self.buffer.len() as u32;
if msg.body().is_binary() {
if let ClientBody::Binary(bytes) = msg.replace_body(ClientBody::Empty) {
if let Body::Binary(bytes) = msg.replace_body(Body::Empty) {
self.written += bytes.len() as u64;
self.encoder.write(bytes.as_ref())?;
}
@@ -223,15 +223,15 @@ impl HttpClientWriter {
fn content_encoder(buf: &mut BytesMut, req: &mut ClientRequest) -> ContentEncoder {
let version = req.version();
let mut body = req.replace_body(ClientBody::Empty);
let mut body = req.replace_body(Body::Empty);
let mut encoding = req.content_encoding();
let mut transfer = match body {
ClientBody::Empty => {
Body::Empty => {
req.headers_mut().remove(CONTENT_LENGTH);
TransferEncoding::length(0)
}
ClientBody::Binary(ref mut bytes) => {
Body::Binary(ref mut bytes) => {
if encoding.is_compression() {
let mut tmp = BytesMut::new();
let mut transfer = TransferEncoding::eof();
@@ -270,7 +270,7 @@ fn content_encoder(buf: &mut BytesMut, req: &mut ClientRequest) -> ContentEncode
.insert(CONTENT_LENGTH, HeaderValue::try_from(b.freeze()).unwrap());
TransferEncoding::eof()
}
ClientBody::Streaming(_) | ClientBody::Actor(_) => {
Body::Streaming(_) | Body::Actor(_) => {
if req.upgrade() {
if version == Version::HTTP_2 {
error!("Connection upgrade is forbidden for HTTP/2");