* 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

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index b60c57138b953cab153c45260bf9809771ddfe67..d4b152019d0e928c7d1001f1c8100dcd0a53ecf2 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1703,7 +1703,7 @@ static void transit(h2_session *session, const char *action, h2_session_state ns
                      * 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 @@ static void transit(h2_session *session, const char *action, h2_session_state ns
                 }
                 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 */