From a9f26286f9bb60d88b6899cf91d2f868bb6585f4 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Tue, 13 Apr 2021 21:20:45 -0700
Subject: [PATCH] reduce branches in h1 dispatcher poll_keepalive (#2089)

---
 actix-http/src/h1/dispatcher.rs | 24 +++++++-----------------
 actix-http/src/lib.rs           |  4 ++--
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/actix-http/src/h1/dispatcher.rs b/actix-http/src/h1/dispatcher.rs
index e775846e9..3b272f0fb 100644
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@@ -649,11 +649,6 @@ where
                         // go into Some<Pin<&mut Sleep>> branch
                         this.ka_timer.set(Some(sleep_until(deadline)));
                         return self.poll_keepalive(cx);
-                    } else {
-                        this.flags.insert(Flags::READ_DISCONNECT);
-                        if let Some(mut payload) = this.payload.take() {
-                            payload.set_error(PayloadError::Incomplete(None));
-                        }
                     }
                 }
             }
@@ -683,19 +678,14 @@ where
                                 }
                             } else {
                                 // timeout on first request (slow request) return 408
-                                if !this.flags.contains(Flags::STARTED) {
-                                    trace!("Slow request timeout");
-                                    let _ = self.as_mut().send_response(
-                                        Response::new(StatusCode::REQUEST_TIMEOUT)
-                                            .drop_body(),
-                                        ResponseBody::Other(Body::Empty),
-                                    );
-                                    this = self.project();
-                                } else {
-                                    trace!("Keep-alive connection timeout");
-                                }
+                                trace!("Slow request timeout");
+                                let _ = self.as_mut().send_response(
+                                    Response::new(StatusCode::REQUEST_TIMEOUT)
+                                        .drop_body(),
+                                    ResponseBody::Other(Body::Empty),
+                                );
+                                this = self.project();
                                 this.flags.insert(Flags::STARTED | Flags::SHUTDOWN);
-                                this.state.set(State::None);
                             }
                             // still have unfinished task. try to reset and register keep-alive.
                         } else if let Some(deadline) =
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 8674834e0..4547f3ef2 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -60,8 +60,8 @@ pub use self::http_message::HttpMessage;
 pub use self::message::{Message, RequestHead, RequestHeadType, ResponseHead};
 pub use self::payload::{Payload, PayloadStream};
 pub use self::request::Request;
-pub use self::response::{Response};
-pub use self::response_builder::{ResponseBuilder};
+pub use self::response::Response;
+pub use self::response_builder::ResponseBuilder;
 pub use self::service::HttpService;
 
 pub mod http {