Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/proto/h2/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ where
}
let (head, body) = req.into_parts();
let mut req = ::http::Request::from_parts(head, ());
super::strip_connection_headers(req.headers_mut(), true);
super::strip_connection_headers(req.headers_mut(), super::MessageKind::Request);
if let Some(len) = body.size_hint().exact() {
if len != 0 || headers::method_has_defined_payload_semantics(req.method()) {
headers::set_content_length_if_missing(req.headers_mut(), len);
Expand Down
22 changes: 16 additions & 6 deletions src/proto/h2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::task::{Context, Poll};
use bytes::Buf;
use futures_core::ready;
use h2::SendStream;
use http::header::{HeaderName, CONNECTION, TE, TRANSFER_ENCODING, UPGRADE};
use http::header::{HeaderName, CONNECTION, TRANSFER_ENCODING, UPGRADE};
use http::HeaderMap;
use pin_project_lite::pin_project;

Expand Down Expand Up @@ -40,22 +40,32 @@ static CONNECTION_HEADERS: [HeaderName; 4] = [
UPGRADE,
];

fn strip_connection_headers(headers: &mut HeaderMap, is_request: bool) {
enum MessageKind {
#[cfg(feature = "client")]
Request,
#[cfg(feature = "server")]
Response,
}

fn strip_connection_headers(headers: &mut HeaderMap, kind: MessageKind) {
for header in &CONNECTION_HEADERS {
if headers.remove(header).is_some() {
warn!("Connection header illegal in HTTP/2: {}", header.as_str());
}
}

if is_request {
#[cfg(not(feature = "client"))]
let _ = kind;
#[cfg(feature = "client")]
if matches!(kind, MessageKind::Request) {
if headers
.get(TE)
.get(http::header::TE)
.map_or(false, |te_header| te_header != "trailers")
{
warn!("TE headers not set to \"trailers\" are illegal in HTTP/2 requests");
headers.remove(TE);
headers.remove(http::header::TE);
}
} else if headers.remove(TE).is_some() {
} else if headers.remove(http::header::TE).is_some() {
warn!("TE headers illegal in HTTP/2 responses");
}

Expand Down
5 changes: 4 additions & 1 deletion src/proto/h2/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,10 @@ where

let (head, body) = res.into_parts();
let mut res = ::http::Response::from_parts(head, ());
super::strip_connection_headers(res.headers_mut(), false);
super::strip_connection_headers(
res.headers_mut(),
super::MessageKind::Response,
);

// set Date header if it isn't already set if instructed
if *me.date_header {
Expand Down
Loading