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

Merge branch 'master' of https://github.com/actix/actix-web into h2-speed-1393

This commit is contained in:
Maksym Vorobiov 2020-03-05 11:51:24 +02:00
parent 3a8b4d7022 a7d805aab7
commit a19cae8472
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -10,10 +10,10 @@
### Changed
* Use `sha-1` crate instead of unmaintained `sha1` crate
* Skip empty chunks when returning response from a `Stream` #1308
* Update the `time` dependency to 0.2.7
* Update `actix-tls` dependency to 2.0.0-alpha.1
* Update `rustls` dependency to 0.17
## [2.0.0] - 2019-12-25

4
Cargo.toml
View File

@ -68,7 +68,7 @@ actix-server = "1.0.0"
actix-testing = "1.0.0"
actix-macros = "0.1.0"
actix-threadpool = "0.3.1"
actix-tls = "1.0.0"
actix-tls = "2.0.0-alpha.1"
actix-web-codegen = "0.2.0"
actix-http = "2.0.0-alpha.1"
@ -90,7 +90,7 @@ serde_urlencoded = "0.6.1"
time = { version = "0.2.7", default-features = false, features = ["std"] }
url = "2.1"
open-ssl = { version="0.10", package = "openssl", optional = true }
rust-tls = { version = "0.16.0", package = "rustls", optional = true }
rust-tls = { version = "0.17.0", package = "rustls", optional = true }
[dev-dependencies]
actix = "0.10.0-alpha.1"

2
actix-framed/Cargo.toml
View File

@ -32,6 +32,6 @@ log = "0.4"
[dev-dependencies]
actix-server = "1.0.0"
actix-connect = { version = "1.0.0", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-utils = "1.0.3"

7
actix-http/CHANGES.md
View File

@ -1,9 +1,11 @@
# Changes
## [NEXT] - 2020-02-27
## [2.0.0-alpha.2] - someday
### Changed
* Update `actix-connect` and `actix-tls` dependency to 2.0.0-alpha.1
* Change default initial window size and connection window size for HTTP2 to 2MB and 1MB respectively to improve download speed for awc when downloading large objects.
* client::Connector accepts initial_window_size and initial_connection_window_size HTTP2 configuration
@ -15,11 +17,8 @@
### Changed
* Update the `time` dependency to 0.2.7.
* Moved actors messages support from actix crate, enabled with feature `actors`.
* Breaking change: trait MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next().
* MessageBody is not implemented for &'static [u8] anymore.
### Fixed

10
actix-http/Cargo.toml
View File

@ -45,11 +45,11 @@ actors = ["actix"]
[dependencies]
actix-service = "1.0.5"
actix-codec = "0.2.0"
actix-connect = "1.0.2"
actix-connect = "2.0.0-alpha.1"
actix-utils = "1.0.6"
actix-rt = "1.0.0"
actix-threadpool = "0.3.1"
actix-tls = { version = "1.0.0", optional = true }
actix-tls = { version = "2.0.0-alpha.1", optional = true }
actix = { version = "0.10.0-alpha.1", optional = true }
base64 = "0.11"
@ -94,15 +94,15 @@ fail-ure = { version = "0.1.5", package="failure", optional = true }
[dev-dependencies]
actix-server = "1.0.1"
actix-connect = { version = "1.0.2", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-tls = { version = "1.0.0", features=["openssl"] }
actix-tls = { version = "2.0.0-alpha.1", features=["openssl"] }
criterion = "0.3"
futures = "0.3.1"
env_logger = "0.7"
serde_derive = "1.0"
open-ssl = { version="0.10", package = "openssl" }
rust-tls = { version="0.16", package = "rustls" }
rust-tls = { version="0.17", package = "rustls" }
[[bench]]
name = "content-length"

24
actix-http/src/h1/dispatcher.rs
View File

@ -73,7 +73,7 @@ where
U::Error: fmt::Display,
{
Normal(#[pin] InnerDispatcher<T, S, B, X, U>),
Upgrade(#[pin] U::Future),
Upgrade(Pin<Box<U::Future>>),
}
#[pin_project]
@ -123,8 +123,8 @@ where
B: MessageBody,
{
None,
ExpectCall(#[pin] X::Future),
ServiceCall(#[pin] S::Future),
ExpectCall(Pin<Box<X::Future>>),
ServiceCall(Pin<Box<S::Future>>),
SendPayload(#[pin] ResponseBody<B>),
}
@ -391,11 +391,11 @@ where
}
None => None,
},
State::ExpectCall(fut) => match fut.poll(cx) {
State::ExpectCall(fut) => match fut.as_mut().poll(cx) {
Poll::Ready(Ok(req)) => {
self.as_mut().send_continue();
this = self.as_mut().project();
this.state.set(State::ServiceCall(this.service.call(req)));
this.state.set(State::ServiceCall(Box::pin(this.service.call(req))));
continue;
}
Poll::Ready(Err(e)) => {
@ -405,7 +405,7 @@ where
}
Poll::Pending => None,
},
State::ServiceCall(fut) => match fut.poll(cx) {
State::ServiceCall(fut) => match fut.as_mut().poll(cx) {
Poll::Ready(Ok(res)) => {
let (res, body) = res.into().replace_body(());
let state = self.as_mut().send_response(res, body)?;
@ -485,8 +485,8 @@ where
) -> Result<State<S, B, X>, DispatchError> {
// Handle `EXPECT: 100-Continue` header
let req = if req.head().expect() {
let mut task = self.as_mut().project().expect.call(req);
match unsafe { Pin::new_unchecked(&mut task) }.poll(cx) {
let mut task = Box::pin(self.as_mut().project().expect.call(req));
match task.as_mut().poll(cx) {
Poll::Ready(Ok(req)) => {
self.as_mut().send_continue();
req
@ -504,8 +504,8 @@ where
};
// Call service
let mut task = self.as_mut().project().service.call(req);
match unsafe { Pin::new_unchecked(&mut task) }.poll(cx) {
let mut task = Box::pin(self.as_mut().project().service.call(req));
match task.as_mut().poll(cx) {
Poll::Ready(Ok(res)) => {
let (res, body) = res.into().replace_body(());
self.send_response(res, body)
@ -807,7 +807,7 @@ where
self.as_mut()
.project()
.inner
.set(DispatcherState::Upgrade(upgrade));
.set(DispatcherState::Upgrade(Box::pin(upgrade)));
return self.poll(cx);
}
@ -855,7 +855,7 @@ where
}
}
}
DispatcherState::Upgrade(fut) => fut.poll(cx).map_err(|e| {
DispatcherState::Upgrade(fut) => fut.as_mut().poll(cx).map_err(|e| {
error!("Upgrade handler error: {}", e);
DispatchError::Upgrade
}),

6
awc/Cargo.toml
View File

@ -51,16 +51,16 @@ serde = "1.0"
serde_json = "1.0"
serde_urlencoded = "0.6.1"
open-ssl = { version="0.10", package="openssl", optional = true }
rust-tls = { version = "0.16.0", package="rustls", optional = true, features = ["dangerous_configuration"] }
rust-tls = { version = "0.17.0", package="rustls", optional = true, features = ["dangerous_configuration"] }
[dev-dependencies]
actix-connect = { version = "1.0.1", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-web = { version = "2.0.0", features=["openssl"] }
actix-http = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-utils = "1.0.3"
actix-server = "1.0.0"
actix-tls = { version = "1.0.0", features=["openssl", "rustls"] }
actix-tls = { version = "2.0.0-alpha.1", features=["openssl", "rustls"] }
brotli2 = "0.3.2"
flate2 = "1.0.13"
futures = "0.3.1"

1
test-server/CHANGES.md
View File

@ -3,6 +3,7 @@
## [Unreleased] - 2020-xx-xx
* Update the `time` dependency to 0.2.7
* Update `actix-connect` dependency to 2.0.0-alpha.1
## [1.0.0] - 2019-12-13

2
test-server/Cargo.toml
View File

@ -32,7 +32,7 @@ openssl = ["open-ssl", "awc/openssl"]
[dependencies]
actix-service = "1.0.1"
actix-codec = "0.2.0"
actix-connect = "1.0.0"
actix-connect = "2.0.0-alpha.1"
actix-utils = "1.0.3"
actix-rt = "1.0.0"
actix-server = "1.0.0"