From 83ef50384c06ca50c69a5bbc9f25c6e100c75ea9 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 29 Jan 2022 05:25:03 +0000 Subject: [PATCH] update changelog temp --- actix-http/CHANGES.md | 6 ++++++ actix-http/tests/test_server.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 7c3da9a8e..4975dc5d6 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -1,12 +1,18 @@ # Changes ## Unreleased - 2021-xx-xx +### Added +- Implement `Default` for `KeepAlive`. [#2611] + ### Changed - Rename `ServiceConfig::{client_timer_expire => client_request_deadline}`. [#2611] - Rename `ServiceConfig::{client_timer => client_request_timer}`. [#2611] - Rename `ServiceConfig::{client_disconnect_timer => client_disconnect_deadline}`. [#2611] - Rename `ServiceConfig::{keep_alive_timer => keep_alive_deadline}`. [#2611] +### Fixed +- HTTP/1.1 dispatcher correctly uses client request timeout. [#2611] + [#2611]: https://github.com/actix/actix-web/pull/2611 diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs index 88552930c..724b6fb62 100644 --- a/actix-http/tests/test_server.rs +++ b/actix-http/tests/test_server.rs @@ -219,7 +219,7 @@ async fn slow_request_408() { data ); - let diff = Instant::now().duration_since(start); + let diff = start.elapsed(); if diff < Duration::from_secs(1) { // test success