1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-10 12:54:20 +02:00

Compare commits

..

6 Commits

Author SHA1 Message Date
f4851b3914 chore(actix-router): prepare release 0.5.2 2023-12-24 16:47:58 +00:00
68597b5426 build(deps): bump taiki-e/install-action from 2.22.0 to 2.23.0 (#3228)
Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.22.0 to 2.23.0.
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/install-action/compare/v2.22.0...v2.23.0)

---
updated-dependencies:
- dependency-name: taiki-e/install-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-23 19:54:02 +00:00
9dc3ad754e chore(actix-web): prepare release 4.4.1 2023-12-23 19:19:10 +00:00
17060ed993 chore(awc): prepare release 3.3.0 2023-12-23 19:18:29 +00:00
0d9ca4d939 chore(actix-http): prepare release 3.5.0 2023-12-23 19:17:56 +00:00
ff2904ee78 ci: prevent cargo-cache install failing MSRV builds 2023-12-23 19:13:11 +00:00
31 changed files with 493 additions and 185 deletions

View File

@ -45,7 +45,7 @@ jobs:
toolchain: ${{ matrix.version.version }} toolchain: ${{ matrix.version.version }}
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@v2.22.0 uses: taiki-e/install-action@v2.23.0
with: with:
tool: cargo-hack tool: cargo-hack
@ -71,7 +71,7 @@ jobs:
- name: Clear the cargo caches - name: Clear the cargo caches
run: | run: |
cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean cargo --locked install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
cargo-cache cargo-cache
ci_feature_powerset_check: ci_feature_powerset_check:
@ -85,7 +85,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.6.0 uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@v2.22.0 uses: taiki-e/install-action@v2.23.0
with: with:
tool: cargo-hack tool: cargo-hack
@ -106,7 +106,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.6.0 uses: actions-rust-lang/setup-rust-toolchain@v1.6.0
- name: Install nextest - name: Install nextest
uses: taiki-e/install-action@v2.22.0 uses: taiki-e/install-action@v2.23.0
with: with:
tool: nextest tool: nextest

View File

@ -50,7 +50,7 @@ jobs:
toolchain: ${{ matrix.version.version }} toolchain: ${{ matrix.version.version }}
- name: Install cargo-hack - name: Install cargo-hack
uses: taiki-e/install-action@v2.22.0 uses: taiki-e/install-action@v2.23.0
with: with:
tool: cargo-hack tool: cargo-hack
@ -83,7 +83,7 @@ jobs:
- name: Clear the cargo caches - name: Clear the cargo caches
run: | run: |
cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean cargo --locked install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
cargo-cache cargo-cache
io-uring: io-uring:

View File

@ -23,7 +23,7 @@ jobs:
components: llvm-tools-preview components: llvm-tools-preview
- name: Install cargo-llvm-cov - name: Install cargo-llvm-cov
uses: taiki-e/install-action@v2.22.0 uses: taiki-e/install-action@v2.23.0
with: with:
tool: cargo-llvm-cov tool: cargo-llvm-cov

View File

@ -3,6 +3,7 @@ use std::{
str::FromStr, str::FromStr,
}; };
use actix_utils::future::{ready, Ready};
use actix_web::{dev::Payload, FromRequest, HttpRequest}; use actix_web::{dev::Payload, FromRequest, HttpRequest};
use crate::error::UriSegmentError; use crate::error::UriSegmentError;
@ -87,10 +88,10 @@ impl AsRef<Path> for PathBufWrap {
impl FromRequest for PathBufWrap { impl FromRequest for PathBufWrap {
type Error = UriSegmentError; type Error = UriSegmentError;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { ready(req.match_info().unprocessed().parse())
req.match_info().unprocessed().parse()
} }
} }

View File

@ -2,14 +2,16 @@
## Unreleased ## Unreleased
## 3.5.0
### Changed ### Changed
- Implement `From<HeaderMap>` for `http::HeaderMap`.
- Updated `zstd` dependency to `0.13`. - Updated `zstd` dependency to `0.13`.
- Implemented `From<HeaderMap>` for `http::HeaderMap`.
### Fixed ### Fixed
- Do not encode zero-sized response bodies - Prevent compression of zero-sized response bodies.
## 3.4.0 ## 3.4.0

View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-http" name = "actix-http"
version = "3.4.0" version = "3.5.0"
authors = [ authors = [
"Nikolay Kim <fafhrd91@gmail.com>", "Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>", "Rob Ede <robjtede@icloud.com>",

View File

@ -5,11 +5,11 @@
<!-- prettier-ignore-start --> <!-- prettier-ignore-start -->
[![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http) [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.4.0)](https://docs.rs/actix-http/3.4.0) [![Documentation](https://docs.rs/actix-http/badge.svg?version=3.5.0)](https://docs.rs/actix-http/3.5.0)
![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg) ![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
<br /> <br />
[![dependency status](https://deps.rs/crate/actix-http/3.4.0/status.svg)](https://deps.rs/crate/actix-http/3.4.0) [![dependency status](https://deps.rs/crate/actix-http/3.5.0/status.svg)](https://deps.rs/crate/actix-http/3.5.0)
[![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http) [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x) [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
## 0.5.2
- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency. - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.5.1 ## 0.5.1

View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-router" name = "actix-router"
version = "0.5.1" version = "0.5.2"
authors = [ authors = [
"Nikolay Kim <fafhrd91@gmail.com>", "Nikolay Kim <fafhrd91@gmail.com>",
"Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>", "Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",

View File

@ -1,11 +1,11 @@
# `actix-router` # `actix-router`
[![crates.io](https://img.shields.io/crates/v/actix-router?label=latest)](https://crates.io/crates/actix-router) [![crates.io](https://img.shields.io/crates/v/actix-router?label=latest)](https://crates.io/crates/actix-router)
[![Documentation](https://docs.rs/actix-router/badge.svg?version=0.5.1)](https://docs.rs/actix-router/0.5.1) [![Documentation](https://docs.rs/actix-router/badge.svg?version=0.5.2)](https://docs.rs/actix-router/0.5.2)
![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg) ![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-router.svg) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-router.svg)
<br /> <br />
[![dependency status](https://deps.rs/crate/actix-router/0.5.1/status.svg)](https://deps.rs/crate/actix-router/0.5.1) [![dependency status](https://deps.rs/crate/actix-router/0.5.2/status.svg)](https://deps.rs/crate/actix-router/0.5.2)
[![Download](https://img.shields.io/crates/d/actix-router.svg)](https://crates.io/crates/actix-router) [![Download](https://img.shields.io/crates/d/actix-router.svg)](https://crates.io/crates/actix-router)
[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x) [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
## 4.4.1
### Changed ### Changed
- Updated `zstd` dependency to `0.13`. - Updated `zstd` dependency to `0.13`.

View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web" name = "actix-web"
version = "4.4.0" version = "4.4.1"
description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust" description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
authors = [ authors = [
"Nikolay Kim <fafhrd91@gmail.com>", "Nikolay Kim <fafhrd91@gmail.com>",
@ -75,7 +75,7 @@ actix-service = "2"
actix-utils = "3" actix-utils = "3"
actix-tls = { version = "3.1", default-features = false, optional = true } actix-tls = { version = "3.1", default-features = false, optional = true }
actix-http = { version = "3.4", features = ["ws"] } actix-http = { version = "3.5", features = ["ws"] }
actix-router = "0.5" actix-router = "0.5"
actix-web-codegen = { version = "4.2", optional = true } actix-web-codegen = { version = "4.2", optional = true }
@ -100,7 +100,6 @@ serde_json = "1.0"
serde_urlencoded = "0.7" serde_urlencoded = "0.7"
smallvec = "1.6.1" smallvec = "1.6.1"
socket2 = "0.5" socket2 = "0.5"
tokio = { version = "1.24.2", features = ["macros"] }
time = { version = "0.3", default-features = false, features = ["formatting"] } time = { version = "0.3", default-features = false, features = ["formatting"] }
url = "2.1" url = "2.1"

View File

@ -8,10 +8,10 @@
<!-- prettier-ignore-start --> <!-- prettier-ignore-start -->
[![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web) [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.4.0)](https://docs.rs/actix-web/4.4.0) [![Documentation](https://docs.rs/actix-web/badge.svg?version=4.4.1)](https://docs.rs/actix-web/4.4.1)
![MSRV](https://img.shields.io/badge/rustc-1.68+-ab6000.svg) ![MSRV](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
[![Dependency Status](https://deps.rs/crate/actix-web/4.4.0/status.svg)](https://deps.rs/crate/actix-web/4.4.0) [![Dependency Status](https://deps.rs/crate/actix-web/4.4.1/status.svg)](https://deps.rs/crate/actix-web/4.4.1)
<br /> <br />
[![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml) [![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
[![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)

View File

@ -1,6 +1,7 @@
use std::{any::type_name, ops::Deref, sync::Arc}; use std::{any::type_name, ops::Deref, sync::Arc};
use actix_http::Extensions; use actix_http::Extensions;
use actix_utils::future::{err, ok, Ready};
use futures_core::future::LocalBoxFuture; use futures_core::future::LocalBoxFuture;
use serde::{de, Serialize}; use serde::{de, Serialize};
@ -158,11 +159,12 @@ where
impl<T: ?Sized + 'static> FromRequest for Data<T> { impl<T: ?Sized + 'static> FromRequest for Data<T> {
type Error = Error; type Error = Error;
type Future = Ready<Result<Self, Error>>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
if let Some(st) = req.app_data::<Data<T>>() { if let Some(st) = req.app_data::<Data<T>>() {
Ok(st.clone()) ok(st.clone())
} else { } else {
log::debug!( log::debug!(
"Failed to extract `Data<{}>` for `{}` handler. For the Data extractor to work \ "Failed to extract `Data<{}>` for `{}` handler. For the Data extractor to work \
@ -172,7 +174,7 @@ impl<T: ?Sized + 'static> FromRequest for Data<T> {
req.match_name().unwrap_or_else(|| req.path()) req.match_name().unwrap_or_else(|| req.path())
); );
Err(error::ErrorInternalServerError( err(error::ErrorInternalServerError(
"Requested application data is not configured correctly. \ "Requested application data is not configured correctly. \
View/enable debug logs for more details.", View/enable debug logs for more details.",
)) ))

View File

@ -3,11 +3,13 @@
use std::{ use std::{
convert::Infallible, convert::Infallible,
future::Future, future::Future,
marker::PhantomData,
pin::Pin, pin::Pin,
task::{Context, Poll}, task::{Context, Poll},
}; };
use actix_http::{Method, Uri}; use actix_http::{Method, Uri};
use actix_utils::future::{ok, Ready};
use futures_core::ready; use futures_core::ready;
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
@ -64,17 +66,33 @@ pub trait FromRequest: Sized {
/// The associated error which can be returned. /// The associated error which can be returned.
type Error: Into<Error>; type Error: Into<Error>;
/// Creates a `Self` from request parts asynchronously. /// Future that resolves to a `Self`.
fn from_request( ///
req: &HttpRequest, /// To use an async function or block, the futures must be boxed. The following snippet will be
payload: &mut Payload, /// common when creating async/await extractors (that do not consume the body).
) -> impl Future<Output = Result<Self, Self::Error>>; ///
/// ```ignore
/// type Future = Pin<Box<dyn Future<Output = Result<Self, Self::Error>>>>;
/// // or
/// type Future = futures_util::future::LocalBoxFuture<'static, Result<Self, Self::Error>>;
///
/// fn from_request(req: HttpRequest, ...) -> Self::Future {
/// let req = req.clone();
/// Box::pin(async move {
/// ...
/// })
/// }
/// ```
type Future: Future<Output = Result<Self, Self::Error>>;
/// Create a `Self` from request parts asynchronously.
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future;
/// Create a `Self` from request head asynchronously. /// Create a `Self` from request head asynchronously.
/// ///
/// This method is short for `T::from_request(req, &mut Payload::None)`. /// This method is short for `T::from_request(req, &mut Payload::None)`.
fn extract(req: &HttpRequest) -> impl Future<Output = Result<Self, Self::Error>> { fn extract(req: &HttpRequest) -> Self::Future {
async { Self::from_request(req, &mut Payload::None).await } Self::from_request(req, &mut Payload::None)
} }
} }
@ -128,19 +146,12 @@ where
T: FromRequest, T: FromRequest,
{ {
type Error = Infallible; type Error = Infallible;
type Future = FromRequestOptFuture<T::Future>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
match T::from_request(req, payload).await { FromRequestOptFuture {
Ok(t) => Ok(Some(t)), fut: T::from_request(req, payload),
Err(err) => {
log::debug!(
"Error from `Option<{}>` extractor: {}",
std::any::type_name::<T>(),
err.into()
);
Ok(None)
}
} }
} }
} }
@ -192,11 +203,9 @@ where
/// ///
/// impl FromRequest for Thing { /// impl FromRequest for Thing {
/// type Error = Error; /// type Error = Error;
/// type Future = Ready<Result<Thing, Error>>;
/// ///
/// async fn from_request( /// fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
/// req: &HttpRequest,
/// payload: &mut dev::Payload,
/// ) -> Result<Self, Self::Error> {
/// if rand::random() { /// if rand::random() {
/// ok(Thing { name: "thingy".into() }) /// ok(Thing { name: "thingy".into() })
/// } else { /// } else {
@ -223,10 +232,36 @@ where
T::Error: Into<E>, T::Error: Into<E>,
{ {
type Error = Infallible; type Error = Infallible;
type Future = FromRequestResFuture<T::Future, E>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
Ok(T::from_request(req, payload).await.map_err(Into::into)) FromRequestResFuture {
fut: T::from_request(req, payload),
_phantom: PhantomData,
}
}
}
pin_project! {
pub struct FromRequestResFuture<Fut, E> {
#[pin]
fut: Fut,
_phantom: PhantomData<E>,
}
}
impl<Fut, T, Ei, E> Future for FromRequestResFuture<Fut, E>
where
Fut: Future<Output = Result<T, Ei>>,
Ei: Into<E>,
{
type Output = Result<Result<T, E>, Infallible>;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.project();
let res = ready!(this.fut.poll(cx));
Poll::Ready(Ok(res.map_err(Into::into)))
} }
} }
@ -244,9 +279,10 @@ where
/// ``` /// ```
impl FromRequest for Uri { impl FromRequest for Uri {
type Error = Infallible; type Error = Infallible;
type Future = Ready<Result<Self, Self::Error>>;
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
Ok(req.uri().clone()) ok(req.uri().clone())
} }
} }
@ -264,9 +300,10 @@ impl FromRequest for Uri {
/// ``` /// ```
impl FromRequest for Method { impl FromRequest for Method {
type Error = Infallible; type Error = Infallible;
type Future = Ready<Result<Self, Self::Error>>;
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
Ok(req.method().clone()) ok(req.method().clone())
} }
} }
@ -282,24 +319,88 @@ mod tuple_from_req {
impl<$($T: FromRequest + 'static),+> FromRequest for ($($T,)+) impl<$($T: FromRequest + 'static),+> FromRequest for ($($T,)+)
{ {
type Error = Error; type Error = Error;
type Future = $fut<$($T),+>;
async fn from_request(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
$fut {
$( $(
let $T = $T::from_request(req, payload).await.map_err(Into::into)?; $T: ExtractFuture::Future {
fut: $T::from_request(req, payload)
},
)+
}
}
}
pin_project! {
pub struct $fut<$($T: FromRequest),+> {
$(
#[pin]
$T: ExtractFuture<$T::Future, $T>,
)+
}
}
impl<$($T: FromRequest),+> Future for $fut<$($T),+>
{
type Output = Result<($($T,)+), Error>;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.project();
let mut ready = true;
$(
match this.$T.as_mut().project() {
ExtractProj::Future { fut } => match fut.poll(cx) {
Poll::Ready(Ok(output)) => {
let _ = this.$T.as_mut().project_replace(ExtractFuture::Done { output });
},
Poll::Ready(Err(err)) => return Poll::Ready(Err(err.into())),
Poll::Pending => ready = false,
},
ExtractProj::Done { .. } => {},
ExtractProj::Empty => unreachable!("FromRequest polled after finished"),
}
)+ )+
Ok(($($T,)+)) if ready {
Poll::Ready(Ok(
($(
match this.$T.project_replace(ExtractFuture::Empty) {
ExtractReplaceProj::Done { output } => output,
_ => unreachable!("FromRequest polled after finished"),
},
)+)
))
} else {
Poll::Pending
}
} }
} }
}; };
} }
pin_project! {
#[project = ExtractProj]
#[project_replace = ExtractReplaceProj]
enum ExtractFuture<Fut, Res> {
Future {
#[pin]
fut: Fut
},
Done {
output: Res,
},
Empty
}
}
impl FromRequest for () { impl FromRequest for () {
type Error = Infallible; type Error = Infallible;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] fn from_request(_: &HttpRequest, _: &mut Payload) -> Self::Future {
async fn from_request(_: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { ok(())
Ok(())
} }
} }

View File

@ -1,5 +1,6 @@
use std::{convert::Infallible, net::SocketAddr}; use std::{convert::Infallible, net::SocketAddr};
use actix_utils::future::{err, ok, Ready};
use derive_more::{Display, Error}; use derive_more::{Display, Error};
use crate::{ use crate::{
@ -197,10 +198,10 @@ impl ConnectionInfo {
impl FromRequest for ConnectionInfo { impl FromRequest for ConnectionInfo {
type Error = Infallible; type Error = Infallible;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { ok(req.connection_info().clone())
Ok(req.connection_info().clone())
} }
} }
@ -239,14 +240,14 @@ impl ResponseError for MissingPeerAddr {}
impl FromRequest for PeerAddr { impl FromRequest for PeerAddr {
type Error = MissingPeerAddr; type Error = MissingPeerAddr;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> {
match req.peer_addr() { match req.peer_addr() {
Some(addr) => Ok(PeerAddr(addr)), Some(addr) => ok(PeerAddr(addr)),
None => { None => {
log::error!("Missing peer address."); log::error!("Missing peer address.");
Err(MissingPeerAddr) err(MissingPeerAddr)
} }
} }
} }

View File

@ -1,6 +1,5 @@
use std::{ use std::{
cell::{Ref, RefCell, RefMut}, cell::{Ref, RefCell, RefMut},
convert::Infallible,
fmt, net, fmt, net,
rc::Rc, rc::Rc,
str, str,
@ -8,6 +7,7 @@ use std::{
use actix_http::{Message, RequestHead}; use actix_http::{Message, RequestHead};
use actix_router::{Path, Url}; use actix_router::{Path, Url};
use actix_utils::future::{ok, Ready};
#[cfg(feature = "cookies")] #[cfg(feature = "cookies")]
use cookie::{Cookie, ParseError as CookieParseError}; use cookie::{Cookie, ParseError as CookieParseError};
use smallvec::SmallVec; use smallvec::SmallVec;
@ -20,7 +20,7 @@ use crate::{
http::{header::HeaderMap, Method, Uri, Version}, http::{header::HeaderMap, Method, Uri, Version},
info::ConnectionInfo, info::ConnectionInfo,
rmap::ResourceMap, rmap::ResourceMap,
FromRequest, HttpMessage, Error, FromRequest, HttpMessage,
}; };
#[cfg(feature = "cookies")] #[cfg(feature = "cookies")]
@ -417,11 +417,12 @@ impl Drop for HttpRequest {
/// ); /// );
/// ``` /// ```
impl FromRequest for HttpRequest { impl FromRequest for HttpRequest {
type Error = Infallible; type Error = Error;
type Future = Ready<Result<Self, Error>>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
Ok(req.clone()) ok(req.clone())
} }
} }

View File

@ -1,4 +1,6 @@
use std::ops::Deref; use std::{any::type_name, ops::Deref};
use actix_utils::future::{err, ok, Ready};
use crate::{ use crate::{
dev::Payload, error::ErrorInternalServerError, Error, FromRequest, HttpMessage as _, dev::Payload, error::ErrorInternalServerError, Error, FromRequest, HttpMessage as _,
@ -64,19 +66,19 @@ impl<T: Clone + 'static> Deref for ReqData<T> {
impl<T: Clone + 'static> FromRequest for ReqData<T> { impl<T: Clone + 'static> FromRequest for ReqData<T> {
type Error = Error; type Error = Error;
type Future = Ready<Result<Self, Error>>;
#[inline] fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> {
if let Some(st) = req.extensions().get::<T>() { if let Some(st) = req.extensions().get::<T>() {
Ok(ReqData(st.clone())) ok(ReqData(st.clone()))
} else { } else {
log::debug!( log::debug!(
"Failed to extract App-level ReqData<{}>. Request path: {}", "Failed to construct App-level ReqData extractor. \
std::any::type_name::<T>(), Request path: {:?} (type: {})",
req.path(), req.path(),
type_name::<T>(),
); );
err(ErrorInternalServerError(
Err(ErrorInternalServerError(
"Missing expected request extension data", "Missing expected request extension data",
)) ))
} }

View File

@ -125,11 +125,11 @@ impl ServiceRequest {
/// # todo!() /// # todo!()
/// } /// }
/// ``` /// ```
pub async fn extract<T: FromRequest>(&mut self) -> Result<T, <T as FromRequest>::Error> pub fn extract<T>(&mut self) -> <T as FromRequest>::Future
where where
T: FromRequest, T: FromRequest,
{ {
T::from_request(&self.req, &mut self.payload).await T::from_request(&self.req, &mut self.payload)
} }
/// Construct request from parts. /// Construct request from parts.

View File

@ -1,6 +1,15 @@
//! For either helper, see [`Either`]. //! For either helper, see [`Either`].
use std::{
future::Future,
mem,
pin::Pin,
task::{Context, Poll},
};
use bytes::Bytes; use bytes::Bytes;
use futures_core::ready;
use pin_project_lite::pin_project;
use crate::{ use crate::{
body::EitherBody, body::EitherBody,
@ -149,7 +158,7 @@ where
fn from(err: EitherExtractError<L, R>) -> Error { fn from(err: EitherExtractError<L, R>) -> Error {
match err { match err {
EitherExtractError::Bytes(err) => err, EitherExtractError::Bytes(err) => err,
EitherExtractError::Extract(l_err, _r_err) => l_err.into(), EitherExtractError::Extract(a_err, _b_err) => a_err.into(),
} }
} }
} }
@ -161,25 +170,112 @@ where
R: FromRequest + 'static, R: FromRequest + 'static,
{ {
type Error = EitherExtractError<L::Error, R::Error>; type Error = EitherExtractError<L::Error, R::Error>;
type Future = EitherExtractFut<L, R>;
async fn from_request( fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
req: &HttpRequest, EitherExtractFut {
payload: &mut dev::Payload, req: req.clone(),
) -> Result<Self, Self::Error> { state: EitherExtractState::Bytes {
let buf = Bytes::from_request(req, payload) bytes: Bytes::from_request(req, payload),
.await
.map_err(EitherExtractError::Bytes)?;
match L::from_request(req, &mut payload_from_bytes(buf.clone())).await {
Ok(left) => Ok(Either::Left(left)),
Err(l_err) => match R::from_request(req, &mut payload_from_bytes(buf)).await {
Ok(right) => Ok(Either::Right(right)),
Err(r_err) => Err(EitherExtractError::Extract(l_err, r_err)),
}, },
} }
} }
} }
pin_project! {
pub struct EitherExtractFut<L, R>
where
R: FromRequest,
L: FromRequest,
{
req: HttpRequest,
#[pin]
state: EitherExtractState<L, R>,
}
}
pin_project! {
#[project = EitherExtractProj]
pub enum EitherExtractState<L, R>
where
L: FromRequest,
R: FromRequest,
{
Bytes {
#[pin]
bytes: <Bytes as FromRequest>::Future,
},
Left {
#[pin]
left: L::Future,
fallback: Bytes,
},
Right {
#[pin]
right: R::Future,
left_err: Option<L::Error>,
},
}
}
impl<R, RF, RE, L, LF, LE> Future for EitherExtractFut<L, R>
where
L: FromRequest<Future = LF, Error = LE>,
R: FromRequest<Future = RF, Error = RE>,
LF: Future<Output = Result<L, LE>> + 'static,
RF: Future<Output = Result<R, RE>> + 'static,
LE: Into<Error>,
RE: Into<Error>,
{
type Output = Result<Either<L, R>, EitherExtractError<LE, RE>>;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.project();
let ready = loop {
let next = match this.state.as_mut().project() {
EitherExtractProj::Bytes { bytes } => {
let res = ready!(bytes.poll(cx));
match res {
Ok(bytes) => {
let fallback = bytes.clone();
let left = L::from_request(this.req, &mut payload_from_bytes(bytes));
EitherExtractState::Left { left, fallback }
}
Err(err) => break Err(EitherExtractError::Bytes(err)),
}
}
EitherExtractProj::Left { left, fallback } => {
let res = ready!(left.poll(cx));
match res {
Ok(extracted) => break Ok(Either::Left(extracted)),
Err(left_err) => {
let right = R::from_request(
this.req,
&mut payload_from_bytes(mem::take(fallback)),
);
EitherExtractState::Right {
left_err: Some(left_err),
right,
}
}
}
}
EitherExtractProj::Right { right, left_err } => {
let res = ready!(right.poll(cx));
match res {
Ok(data) => break Ok(Either::Right(data)),
Err(err) => {
break Err(EitherExtractError::Extract(left_err.take().unwrap(), err));
}
}
}
};
this.state.set(next);
};
Poll::Ready(ready)
}
}
fn payload_from_bytes(bytes: Bytes) -> dev::Payload { fn payload_from_bytes(bytes: Bytes) -> dev::Payload {
let (_, mut h1_payload) = actix_http::h1::Payload::create(true); let (_, mut h1_payload) = actix_http::h1::Payload::create(true);
h1_payload.unread_data(bytes); h1_payload.unread_data(bytes);

View File

@ -13,7 +13,7 @@ use std::{
use actix_http::Payload; use actix_http::Payload;
use bytes::BytesMut; use bytes::BytesMut;
use encoding_rs::{Encoding, UTF_8}; use encoding_rs::{Encoding, UTF_8};
use futures_core::future::LocalBoxFuture; use futures_core::{future::LocalBoxFuture, ready};
use futures_util::{FutureExt as _, StreamExt as _}; use futures_util::{FutureExt as _, StreamExt as _};
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
@ -126,21 +126,51 @@ where
T: DeserializeOwned + 'static, T: DeserializeOwned + 'static,
{ {
type Error = Error; type Error = Error;
type Future = FormExtractFut<T>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
let FormConfig { limit, err_handler } = FormConfig::from_req(req); let FormConfig { limit, err_handler } = FormConfig::from_req(req).clone();
match UrlEncoded::new(req, payload).limit(*limit).await { FormExtractFut {
Ok(form) => Ok(Form(form)), fut: UrlEncoded::new(req, payload).limit(limit),
Err(err) => Err(match err_handler { req: req.clone(),
Some(err_handler) => (err_handler)(err, req), err_handler,
None => err.into(),
}),
} }
} }
} }
type FormErrHandler = Option<Rc<dyn Fn(UrlencodedError, &HttpRequest) -> Error>>;
pub struct FormExtractFut<T> {
fut: UrlEncoded<T>,
err_handler: FormErrHandler,
req: HttpRequest,
}
impl<T> Future for FormExtractFut<T>
where
T: DeserializeOwned + 'static,
{
type Output = Result<Form<T>, Error>;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.get_mut();
let res = ready!(Pin::new(&mut this.fut).poll(cx));
let res = match res {
Err(err) => match &this.err_handler {
Some(err_handler) => Err((err_handler)(err, &this.req)),
None => Err(err.into()),
},
Ok(item) => Ok(Form(item)),
};
Poll::Ready(res)
}
}
impl<T: fmt::Display> fmt::Display for Form<T> { impl<T: fmt::Display> fmt::Display for Form<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f) self.0.fmt(f)
@ -168,8 +198,6 @@ impl<T: Serialize> Responder for Form<T> {
} }
} }
type FormErrHandler = Option<Rc<dyn Fn(UrlencodedError, &HttpRequest) -> Error>>;
/// [`Form`] extractor configuration. /// [`Form`] extractor configuration.
/// ///
/// ``` /// ```

View File

@ -2,6 +2,8 @@
use std::{fmt, ops}; use std::{fmt, ops};
use actix_utils::future::{ready, Ready};
use crate::{ use crate::{
dev::Payload, error::ParseError, extract::FromRequest, http::header::Header as ParseHeader, dev::Payload, error::ParseError, extract::FromRequest, http::header::Header as ParseHeader,
HttpRequest, HttpRequest,
@ -59,12 +61,13 @@ where
T: ParseHeader, T: ParseHeader,
{ {
type Error = ParseError; type Error = ParseError;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] #[inline]
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
match ParseHeader::parse(req) { match ParseHeader::parse(req) {
Ok(header) => Ok(Header(header)), Ok(header) => ready(Ok(Header(header))),
Err(err) => Err(err), Err(err) => ready(Err(err)),
} }
} }
} }

View File

@ -138,8 +138,10 @@ impl<T: Serialize> Responder for Json<T> {
/// See [here](#extractor) for example of usage as an extractor. /// See [here](#extractor) for example of usage as an extractor.
impl<T: DeserializeOwned> FromRequest for Json<T> { impl<T: DeserializeOwned> FromRequest for Json<T> {
type Error = Error; type Error = Error;
type Future = JsonExtractFut<T>;
async fn from_request(req: &HttpRequest, payload: &mut Payload) -> Result<Self, Self::Error> { #[inline]
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
let config = JsonConfig::from_req(req); let config = JsonConfig::from_req(req);
let limit = config.limit; let limit = config.limit;
@ -147,30 +149,52 @@ impl<T: DeserializeOwned> FromRequest for Json<T> {
let ctype_fn = config.content_type.as_deref(); let ctype_fn = config.content_type.as_deref();
let err_handler = config.err_handler.clone(); let err_handler = config.err_handler.clone();
match JsonBody::new(req, payload, ctype_fn, ctype_required) JsonExtractFut {
.limit(limit) req: Some(req.clone()),
.await fut: JsonBody::new(req, payload, ctype_fn, ctype_required).limit(limit),
{ err_handler,
Ok(data) => Ok(Json(data)),
Err(err) => {
log::debug!(
"Failed to deserialize Json<{}> from payload. \
Request path: {}",
std::any::type_name::<T>(),
req.path(),
);
Err(match err_handler.as_ref() {
Some(err_handler) => (err_handler)(err, req),
None => err.into(),
})
}
} }
} }
} }
type JsonErrorHandler = Option<Arc<dyn Fn(JsonPayloadError, &HttpRequest) -> Error + Send + Sync>>; type JsonErrorHandler = Option<Arc<dyn Fn(JsonPayloadError, &HttpRequest) -> Error + Send + Sync>>;
pub struct JsonExtractFut<T> {
req: Option<HttpRequest>,
fut: JsonBody<T>,
err_handler: JsonErrorHandler,
}
impl<T: DeserializeOwned> Future for JsonExtractFut<T> {
type Output = Result<Json<T>, Error>;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.get_mut();
let res = ready!(Pin::new(&mut this.fut).poll(cx));
let res = match res {
Err(err) => {
let req = this.req.take().unwrap();
log::debug!(
"Failed to deserialize Json from payload. \
Request path: {}",
req.path()
);
if let Some(err_handler) = this.err_handler.as_ref() {
Err((*err_handler)(err, &req))
} else {
Err(err.into())
}
}
Ok(data) => Ok(Json(data)),
};
Poll::Ready(res)
}
}
/// `Json` extractor configuration. /// `Json` extractor configuration.
/// ///
/// # Examples /// # Examples

View File

@ -3,6 +3,7 @@
use std::sync::Arc; use std::sync::Arc;
use actix_router::PathDeserializer; use actix_router::PathDeserializer;
use actix_utils::future::{ready, Ready};
use derive_more::{AsRef, Deref, DerefMut, Display, From}; use derive_more::{AsRef, Deref, DerefMut, Display, From};
use serde::de; use serde::de;
@ -68,13 +69,16 @@ where
T: de::DeserializeOwned, T: de::DeserializeOwned,
{ {
type Error = Error; type Error = Error;
type Future = Ready<Result<Self, Self::Error>>;
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { #[inline]
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
let error_handler = req let error_handler = req
.app_data::<PathConfig>() .app_data::<PathConfig>()
.or_else(|| req.app_data::<Data<PathConfig>>().map(Data::get_ref)) .or_else(|| req.app_data::<Data<PathConfig>>().map(Data::get_ref))
.and_then(|c| c.err_handler.clone()); .and_then(|c| c.err_handler.clone());
ready(
de::Deserialize::deserialize(PathDeserializer::new(req.match_info())) de::Deserialize::deserialize(PathDeserializer::new(req.match_info()))
.map(Path) .map(Path)
.map_err(move |err| { .map_err(move |err| {
@ -90,7 +94,8 @@ where
} else { } else {
ErrorNotFound(err) ErrorNotFound(err)
} }
}) }),
)
} }
} }

View File

@ -9,8 +9,9 @@ use std::{
}; };
use actix_http::error::PayloadError; use actix_http::error::PayloadError;
use actix_utils::future::{ready, Either, Ready};
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
use encoding_rs::Encoding; use encoding_rs::{Encoding, UTF_8};
use futures_core::{ready, stream::Stream}; use futures_core::{ready, stream::Stream};
use mime::Mime; use mime::Mime;
@ -130,13 +131,11 @@ impl Stream for Payload {
/// See [here](#Examples) for example of usage as an extractor. /// See [here](#Examples) for example of usage as an extractor.
impl FromRequest for Payload { impl FromRequest for Payload {
type Error = Error; type Error = Error;
type Future = Ready<Result<Self, Self::Error>>;
#[inline] #[inline]
async fn from_request( fn from_request(_: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
_: &HttpRequest, ready(Ok(Payload(payload.take())))
payload: &mut dev::Payload,
) -> Result<Self, Self::Error> {
Ok(Payload(payload.take()))
} }
} }
@ -158,21 +157,33 @@ impl FromRequest for Payload {
/// ``` /// ```
impl FromRequest for Bytes { impl FromRequest for Bytes {
type Error = Error; type Error = Error;
type Future = Either<BytesExtractFut, Ready<Result<Bytes, Error>>>;
async fn from_request( #[inline]
req: &HttpRequest, fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
payload: &mut dev::Payload,
) -> Result<Self, Self::Error> {
// allow both Config and Data<Config> // allow both Config and Data<Config>
let cfg = PayloadConfig::from_req(req); let cfg = PayloadConfig::from_req(req);
// check content-type if let Err(err) = cfg.check_mimetype(req) {
cfg.check_mimetype(req)?; return Either::right(ready(Err(err)));
}
HttpMessageBody::new(req, payload) Either::left(BytesExtractFut {
.limit(cfg.limit) body_fut: HttpMessageBody::new(req, payload).limit(cfg.limit),
.await })
.map_err(Into::into) }
}
/// Future for `Bytes` extractor.
pub struct BytesExtractFut {
body_fut: HttpMessageBody,
}
impl Future for BytesExtractFut {
type Output = Result<Bytes, Error>;
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
Pin::new(&mut self.body_fut).poll(cx).map_err(Into::into)
} }
} }
@ -193,29 +204,49 @@ impl FromRequest for Bytes {
/// } /// }
impl FromRequest for String { impl FromRequest for String {
type Error = Error; type Error = Error;
type Future = Either<StringExtractFut, Ready<Result<String, Error>>>;
async fn from_request( #[inline]
req: &HttpRequest, fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
payload: &mut dev::Payload,
) -> Result<Self, Self::Error> {
let cfg = PayloadConfig::from_req(req); let cfg = PayloadConfig::from_req(req);
// check content-type // check content-type
cfg.check_mimetype(req)?; if let Err(err) = cfg.check_mimetype(req) {
return Either::right(ready(Err(err)));
}
// check charset // check charset
let encoding = req.encoding()?; let encoding = match req.encoding() {
Ok(enc) => enc,
Err(err) => return Either::right(ready(Err(err.into()))),
};
let limit = cfg.limit; let limit = cfg.limit;
let body_fut = HttpMessageBody::new(req, payload).limit(limit);
let body = HttpMessageBody::new(req, payload).limit(limit).await?; Either::left(StringExtractFut { body_fut, encoding })
}
}
/// Future for `String` extractor.
pub struct StringExtractFut {
body_fut: HttpMessageBody,
encoding: &'static Encoding,
}
impl Future for StringExtractFut {
type Output = Result<String, Error>;
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let encoding = self.encoding;
Pin::new(&mut self.body_fut).poll(cx).map(|out| {
let body = out?;
bytes_to_string(body, encoding) bytes_to_string(body, encoding)
})
} }
} }
fn bytes_to_string(body: Bytes, encoding: &'static Encoding) -> Result<String, Error> { fn bytes_to_string(body: Bytes, encoding: &'static Encoding) -> Result<String, Error> {
use encoding_rs::UTF_8;
if encoding == UTF_8 { if encoding == UTF_8 {
Ok(str::from_utf8(body.as_ref()) Ok(str::from_utf8(body.as_ref())
.map_err(|_| ErrorBadRequest("Can not decode body"))? .map_err(|_| ErrorBadRequest("Can not decode body"))?

View File

@ -2,6 +2,7 @@
use std::{fmt, ops, sync::Arc}; use std::{fmt, ops, sync::Arc};
use actix_utils::future::{err, ok, Ready};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use crate::{dev::Payload, error::QueryPayloadError, Error, FromRequest, HttpRequest}; use crate::{dev::Payload, error::QueryPayloadError, Error, FromRequest, HttpRequest};
@ -107,27 +108,32 @@ impl<T: fmt::Display> fmt::Display for Query<T> {
/// See [here](#Examples) for example of usage as an extractor. /// See [here](#Examples) for example of usage as an extractor.
impl<T: DeserializeOwned> FromRequest for Query<T> { impl<T: DeserializeOwned> FromRequest for Query<T> {
type Error = Error; type Error = Error;
type Future = Ready<Result<Self, Error>>;
async fn from_request(req: &HttpRequest, _: &mut Payload) -> Result<Self, Self::Error> { #[inline]
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
let error_handler = req let error_handler = req
.app_data::<QueryConfig>() .app_data::<QueryConfig>()
.and_then(|c| c.err_handler.clone()); .and_then(|c| c.err_handler.clone());
serde_urlencoded::from_str::<T>(req.query_string()) serde_urlencoded::from_str::<T>(req.query_string())
.map(|val| Ok(Query(val))) .map(|val| ok(Query(val)))
.unwrap_or_else(move |e| { .unwrap_or_else(move |e| {
let err = QueryPayloadError::Deserialize(e); let e = QueryPayloadError::Deserialize(e);
log::debug!( log::debug!(
"Failed during Query extractor deserialization. \ "Failed during Query extractor deserialization. \
Request path: {}", Request path: {:?}",
req.path() req.path()
); );
Err(match error_handler { let e = if let Some(error_handler) = error_handler {
Some(error_handler) => (error_handler)(err, req), (error_handler)(e, req)
None => err.into(), } else {
}) e.into()
};
err(e)
}) })
} }
} }

View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
## 3.3.0
- Update `trust-dns-resolver` dependency to `0.23`. - Update `trust-dns-resolver` dependency to `0.23`.
- Updated `zstd` dependency to `0.13`. - Updated `zstd` dependency to `0.13`.

View File

@ -1,6 +1,6 @@
[package] [package]
name = "awc" name = "awc"
version = "3.2.0" version = "3.3.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Async HTTP and WebSocket client library" description = "Async HTTP and WebSocket client library"
keywords = ["actix", "http", "framework", "async", "web"] keywords = ["actix", "http", "framework", "async", "web"]
@ -61,7 +61,7 @@ dangerous-h2c = []
[dependencies] [dependencies]
actix-codec = "0.5" actix-codec = "0.5"
actix-service = "2" actix-service = "2"
actix-http = { version = "3.4", features = ["http2", "ws"] } actix-http = { version = "3.5", features = ["http2", "ws"] }
actix-rt = { version = "2.1", default-features = false } actix-rt = { version = "2.1", default-features = false }
actix-tls = { version = "3.1", features = ["connect", "uri"] } actix-tls = { version = "3.1", features = ["connect", "uri"] }
actix-utils = "3" actix-utils = "3"
@ -94,7 +94,7 @@ tls-rustls-0_21 = { package = "rustls", version = "0.21", optional = true, featu
trust-dns-resolver = { version = "0.23", optional = true } trust-dns-resolver = { version = "0.23", optional = true }
[dev-dependencies] [dev-dependencies]
actix-http = { version = "3.4", features = ["openssl"] } actix-http = { version = "3.5", features = ["openssl"] }
actix-http-test = { version = "3", features = ["openssl"] } actix-http-test = { version = "3", features = ["openssl"] }
actix-server = "2" actix-server = "2"
actix-test = { version = "0.1", features = ["openssl", "rustls-0_21"] } actix-test = { version = "0.1", features = ["openssl", "rustls-0_21"] }

View File

@ -3,9 +3,9 @@
> Async HTTP and WebSocket client library. > Async HTTP and WebSocket client library.
[![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc) [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
[![Documentation](https://docs.rs/awc/badge.svg?version=3.2.0)](https://docs.rs/awc/3.2.0) [![Documentation](https://docs.rs/awc/badge.svg?version=3.3.0)](https://docs.rs/awc/3.3.0)
![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
[![Dependency Status](https://deps.rs/crate/awc/3.2.0/status.svg)](https://deps.rs/crate/awc/3.2.0) [![Dependency Status](https://deps.rs/crate/awc/3.3.0/status.svg)](https://deps.rs/crate/awc/3.3.0)
[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x) [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
## Documentation & Resources ## Documentation & Resources

View File

@ -1 +0,0 @@
nightly

View File

@ -5,7 +5,7 @@
# requires github cli tool for automatic release draft creation # requires github cli tool for automatic release draft creation
set -euo pipefail set -eEuo pipefail
DIR=$1 DIR=$1
@ -132,6 +132,7 @@ fi
if [ $MACOS ]; then if [ $MACOS ]; then
printf "chore($PACKAGE_NAME): prepare release $NEW_VERSION" | pbcopy printf "chore($PACKAGE_NAME): prepare release $NEW_VERSION" | pbcopy
echo "placed the recommended commit message on the clipboard"
else else
echo echo
echo "commit message:" echo "commit message:"