From: Stefan Eissing <icing@apache.org>
Date: Mon, 1 Feb 2016 16:19:10 +0000 (+0000)
Subject: a little love for timneouts in the sync mpm setups
X-Git-Tag: 2.5.0-alpha~2230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37720cbe22f1206f7fe351818bc625a201de8bad;p=thirdparty%2Fapache%2Fhttpd.git

a little love for timneouts in the sync mpm setups

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

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 1597d787cd1..2e4253a042d 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -2071,7 +2071,10 @@ apr_status_t h2_session_process(h2_session *session, int async)
                 else {
                     /* We wait in smaller increments, using a 1 second timeout.
                      * That gives us the chance to check for MPMQ_STOPPING often. */
-                    h2_filter_cin_timeout_set(session->cin, 1);
+                    h2_filter_cin_timeout_set(session->cin, 
+                                              (h2_stream_set_is_empty(session->streams)?
+                                              session->s->keep_alive_timeout :
+                                              session->s->timeout));
                     status = h2_session_read(session, 1, 10);
                     if (status == APR_SUCCESS) {
                         have_read = 1;