forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(client): prevent empty bodies sending transfer-encoding for GET, HEAD

Browse Source
This commit is contained in:
Sean McArthur
2018-02-16 15:22:06 -08:00
parent dd79a4a0e0
commit 77adab4ebf
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/proto/h1/role.rs
View File

@@ -10,7 +10,7 @@ use proto::{MessageHead, RawStatus, Http1Transaction, ParseResult,
use proto::h1::{Encoder, Decoder, date};
use method::Method;
use status::StatusCode;
use version::HttpVersion::{self, Http10, Http11};
use version::HttpVersion::{Http10, Http11};
const MAX_HEADERS: usize = 100;
const AVERAGE_HEADER_SIZE: usize = 30; // totally scientific
@@ -203,7 +203,7 @@ impl ServerTransaction {
};
if has_body && can_have_body {
set_length(head.version, &mut head.headers)
set_length(&mut head.headers, head.version == Http11)
} else {
head.headers.remove::<TransferEncoding>();
if can_have_body {
@@ -354,7 +354,11 @@ impl Http1Transaction for ClientTransaction {
impl ClientTransaction {
fn set_length(head: &mut RequestHead, has_body: bool) -> Encoder {
if has_body {
set_length(head.version, &mut head.headers)
let can_chunked = head.version == Http11
&& (head.subject.0 != Method::Head)
&& (head.subject.0 != Method::Get)
&& (head.subject.0 != Method::Connect);
set_length(&mut head.headers, can_chunked)
} else {
head.headers.remove::<ContentLength>();
head.headers.remove::<TransferEncoding>();
@@ -363,12 +367,12 @@ impl ClientTransaction {
}
}
fn set_length(version: HttpVersion, headers: &mut Headers) -> Encoder {
fn set_length(headers: &mut Headers, can_chunked: bool) -> Encoder {
let len = headers.get::<header::ContentLength>().map(|n| **n);
if let Some(len) = len {
Encoder::length(len)
} else if version == Http11 {
} else if can_chunked {
let encodings = match headers.get_mut::<header::TransferEncoding>() {
Some(&mut header::TransferEncoding(ref mut encodings)) => {
if encodings.last() != Some(&header::Encoding::Chunked) {