commit 0971bc554d5f38ba065d4d6977e075a1f94b5264
author Stefan Eissing <icing@apache.org> Fri Jul 05 07:08:19 2019 +0000
committer Stefan Eissing <icing@apache.org> Fri Jul 05 07:08:19 2019 +0000
tree 051b9a4b10e5910b89fc870aa5b0972a05a57bd2
parent 04a5ac01fd5a32439eba91f2ad96e56f40014cff

 * applying v4 of the patch for PR 63534.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862583 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_session.c

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index b60c571..d4b1520 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1703,7 +1703,7 @@
                      * that already served requests - not fair. */
                     session->idle_sync_until = apr_time_now() + apr_time_from_sec(1);
                     s = "timeout";
-                    timeout = H2MAX(session->s->timeout, session->s->keep_alive_timeout);
+                    timeout = session->s->timeout;
                     update_child_status(session, SERVER_BUSY_READ, "idle");
                     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, session->c, 
                                   H2_SSSN_LOG("", session, "enter idle, timeout = %d sec"), 
@@ -1711,8 +1711,8 @@
                 }
                 else if (session->open_streams) {
                     s = "timeout";
-                    timeout = session->s->keep_alive_timeout;
-                    update_child_status(session, SERVER_BUSY_KEEPALIVE, "idle");
+                    timeout = session->s->timeout;
+                    update_child_status(session, SERVER_BUSY_READ, "idle");
                 }
                 else {
                     /* normal keepalive setup */