berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Small renaming

This commit is contained in:
Dmitry Pypin 2019-09-09 15:52:58 -07:00
parent 2589298c27
commit 87c8902658
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actix-http/src/client/h1proto.rs
View File

@ -20,7 +20,7 @@ use crate::body::{BodySize, MessageBody};
pub(crate) fn send_request<T, B>( pub(crate) fn send_request<T, B>(
io: T, io: T,
mut head_wrapper: RequestHeadType, mut head: RequestHeadType,
body: B, body: B,
created: time::Instant, created: time::Instant,
pool: Option<Acquired<T>>, pool: Option<Acquired<T>>,
@ -30,18 +30,18 @@ where
B: MessageBody, B: MessageBody,
{ {
// set request host header // set request host header
if !head_wrapper.as_ref().headers.contains_key(HOST) && !head_wrapper.extra_headers().iter().any(|h| h.contains_key(HOST)) { if !head.as_ref().headers.contains_key(HOST) && !head.extra_headers().iter().any(|h| h.contains_key(HOST)) {
if let Some(host) = head_wrapper.as_ref().uri.host() { if let Some(host) = head.as_ref().uri.host() {
let mut wrt = BytesMut::with_capacity(host.len() + 5).writer(); let mut wrt = BytesMut::with_capacity(host.len() + 5).writer();
let _ = match head_wrapper.as_ref().uri.port_u16() { let _ = match head.as_ref().uri.port_u16() {
None | Some(80) | Some(443) => write!(wrt, "{}", host), None | Some(80) | Some(443) => write!(wrt, "{}", host),
Some(port) => write!(wrt, "{}:{}", host, port), Some(port) => write!(wrt, "{}:{}", host, port),
}; };
match wrt.get_mut().take().freeze().try_into() { match wrt.get_mut().take().freeze().try_into() {
Ok(value) => { Ok(value) => {
match head_wrapper { match head {
RequestHeadType::Owned(ref mut head) => { RequestHeadType::Owned(ref mut head) => {
head.headers.insert(HOST, value) head.headers.insert(HOST, value)
}, },
@ -68,7 +68,7 @@ where
// create Framed and send request // create Framed and send request
Framed::new(io, h1::ClientCodec::default()) Framed::new(io, h1::ClientCodec::default())
.send((head_wrapper, len).into()) .send((head, len).into())
.from_err() .from_err()
// send request body // send request body
.and_then(move |framed| match body.size() { .and_then(move |framed| match body.size() {
@ -104,14 +104,14 @@ where
pub(crate) fn open_tunnel<T>( pub(crate) fn open_tunnel<T>(
io: T, io: T,
head_wrapper: RequestHeadType, head: RequestHeadType,
) -> impl Future<Item = (ResponseHead, Framed<T, h1::ClientCodec>), Error = SendRequestError> ) -> impl Future<Item = (ResponseHead, Framed<T, h1::ClientCodec>), Error = SendRequestError>
where where
T: AsyncRead + AsyncWrite + 'static, T: AsyncRead + AsyncWrite + 'static,
{ {
// create Framed and send request // create Framed and send request
Framed::new(io, h1::ClientCodec::default()) Framed::new(io, h1::ClientCodec::default())
.send((head_wrapper, BodySize::None).into()) .send((head, BodySize::None).into())
.from_err() .from_err()
// read response // read response
.and_then(|framed| { .and_then(|framed| {

16
actix-http/src/client/h2proto.rs
View File

@ -19,7 +19,7 @@ use super::pool::Acquired;
pub(crate) fn send_request<T, B>( pub(crate) fn send_request<T, B>(
io: SendRequest<Bytes>, io: SendRequest<Bytes>,
head_wrapper: RequestHeadType, head: RequestHeadType,
body: B, body: B,
created: time::Instant, created: time::Instant,
pool: Option<Acquired<T>>, pool: Option<Acquired<T>>,
@ -28,8 +28,8 @@ where
T: AsyncRead + AsyncWrite + 'static, T: AsyncRead + AsyncWrite + 'static,
B: MessageBody, B: MessageBody,
{ {
trace!("Sending client request: {:?} {:?}", head_wrapper, body.size()); trace!("Sending client request: {:?} {:?}", head, body.size());
let head_req = head_wrapper.as_ref().method == Method::HEAD; let head_req = head.as_ref().method == Method::HEAD;
let length = body.size(); let length = body.size();
let eof = match length { let eof = match length {
BodySize::None | BodySize::Empty | BodySize::Sized(0) => true, BodySize::None | BodySize::Empty | BodySize::Sized(0) => true,
@ -40,8 +40,8 @@ where
.map_err(SendRequestError::from) .map_err(SendRequestError::from)
.and_then(move |mut io| { .and_then(move |mut io| {
let mut req = Request::new(()); let mut req = Request::new(());
*req.uri_mut() = head_wrapper.as_ref().uri.clone(); *req.uri_mut() = head.as_ref().uri.clone();
*req.method_mut() = head_wrapper.as_ref().method.clone(); *req.method_mut() = head.as_ref().method.clone();
*req.version_mut() = Version::HTTP_2; *req.version_mut() = Version::HTTP_2;
let mut skip_len = true; let mut skip_len = true;
@ -67,14 +67,14 @@ where
), ),
}; };
// Extracting extra headers from RequestHeadWrapper. HeaderMap::new() does not allocate. // Extracting extra headers from RequestHeadType. HeaderMap::new() does not allocate.
let (head_wrapper, extra_headers) = match head_wrapper { let (head, extra_headers) = match head {
RequestHeadType::Owned(head) => (RequestHeadType::Owned(head), HeaderMap::new()), RequestHeadType::Owned(head) => (RequestHeadType::Owned(head), HeaderMap::new()),
RequestHeadType::Rc(head, extra_headers) => (RequestHeadType::Rc(head, None), extra_headers.unwrap_or(HeaderMap::new())), RequestHeadType::Rc(head, extra_headers) => (RequestHeadType::Rc(head, None), extra_headers.unwrap_or(HeaderMap::new())),
}; };
// merging headers from head and extra headers. // merging headers from head and extra headers.
let headers = head_wrapper.as_ref().headers.iter() let headers = head.as_ref().headers.iter()
.filter(|(name, _)| { .filter(|(name, _)| {
!extra_headers.contains_key(*name) !extra_headers.contains_key(*name)
}) })

10
actix-http/src/h1/client.rs
View File

@ -194,13 +194,13 @@ impl Encoder for ClientCodec {
dst: &mut BytesMut, dst: &mut BytesMut,
) -> Result<(), Self::Error> { ) -> Result<(), Self::Error> {
match item { match item {
Message::Item((mut head_wrapper, length)) => { Message::Item((mut head, length)) => {
let inner = &mut self.inner; let inner = &mut self.inner;
inner.version = head_wrapper.as_ref().version; inner.version = head.as_ref().version;
inner.flags.set(Flags::HEAD, head_wrapper.as_ref().method == Method::HEAD); inner.flags.set(Flags::HEAD, head.as_ref().method == Method::HEAD);
// connection status // connection status
inner.ctype = match head_wrapper.as_ref().connection_type() { inner.ctype = match head.as_ref().connection_type() {
ConnectionType::KeepAlive => { ConnectionType::KeepAlive => {
if inner.flags.contains(Flags::KEEPALIVE_ENABLED) { if inner.flags.contains(Flags::KEEPALIVE_ENABLED) {
ConnectionType::KeepAlive ConnectionType::KeepAlive
@ -214,7 +214,7 @@ impl Encoder for ClientCodec {
inner.encoder.encode( inner.encoder.encode(
dst, dst,
&mut head_wrapper, &mut head,
false, false,
false, false,
inner.version, inner.version,

16
actix-http/src/h1/encoder.rs
View File

@ -538,9 +538,9 @@ mod tests {
head.headers head.headers
.insert(CONTENT_TYPE, HeaderValue::from_static("plain/text")); .insert(CONTENT_TYPE, HeaderValue::from_static("plain/text"));
let mut head_wrapper = RequestHeadType::Owned(head); let mut head = RequestHeadType::Owned(head);
let _ = head_wrapper.encode_headers( let _ = head.encode_headers(
&mut bytes, &mut bytes,
Version::HTTP_11, Version::HTTP_11,
BodySize::Empty, BodySize::Empty,
@ -552,7 +552,7 @@ mod tests {
Bytes::from_static(b"\r\nContent-Length: 0\r\nConnection: close\r\nDate: date\r\nContent-Type: plain/text\r\n\r\n") Bytes::from_static(b"\r\nContent-Length: 0\r\nConnection: close\r\nDate: date\r\nContent-Type: plain/text\r\n\r\n")
); );
let _ = head_wrapper.encode_headers( let _ = head.encode_headers(
&mut bytes, &mut bytes,
Version::HTTP_11, Version::HTTP_11,
BodySize::Stream, BodySize::Stream,
@ -564,7 +564,7 @@ mod tests {
Bytes::from_static(b"\r\nTransfer-Encoding: chunked\r\nDate: date\r\nContent-Type: plain/text\r\n\r\n") Bytes::from_static(b"\r\nTransfer-Encoding: chunked\r\nDate: date\r\nContent-Type: plain/text\r\n\r\n")
); );
let _ = head_wrapper.encode_headers( let _ = head.encode_headers(
&mut bytes, &mut bytes,
Version::HTTP_11, Version::HTTP_11,
BodySize::Sized64(100), BodySize::Sized64(100),
@ -584,9 +584,9 @@ mod tests {
head.headers head.headers
.append(CONTENT_TYPE, HeaderValue::from_static("xml")); .append(CONTENT_TYPE, HeaderValue::from_static("xml"));
let mut head_wrapper = RequestHeadType::Owned(head); let mut head = RequestHeadType::Owned(head);
let _ = head_wrapper.encode_headers( let _ = head.encode_headers(
&mut bytes, &mut bytes,
Version::HTTP_11, Version::HTTP_11,
BodySize::Stream, BodySize::Stream,
@ -610,9 +610,9 @@ mod tests {
extra_headers.insert(AUTHORIZATION,HeaderValue::from_static("another authorization")); extra_headers.insert(AUTHORIZATION,HeaderValue::from_static("another authorization"));
extra_headers.insert(DATE, HeaderValue::from_static("date")); extra_headers.insert(DATE, HeaderValue::from_static("date"));
let mut head_wrapper = RequestHeadType::Rc(Rc::new(head), Some(extra_headers)); let mut head = RequestHeadType::Rc(Rc::new(head), Some(extra_headers));
let _ = head_wrapper.encode_headers( let _ = head.encode_headers(
&mut bytes, &mut bytes,
Version::HTTP_11, Version::HTTP_11,
BodySize::Empty, BodySize::Empty,