Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1727963 - /httpd/httpd/trunk/modules/http2/h2_session.c
Date: Mon, 01 Feb 2016 16:19:10 -0000
To: cvs@httpd.apache.org
From: icing@apache.org
Message-Id: <20160201161910.E4FDE3A023C@svn01-us-west.apache.org>

Author: icing
Date: Mon Feb  1 16:19:10 2016
New Revision: 1727963

URL: http://svn.apache.org/viewvc?rev=1727963&view=rev
Log:
a little love for timneouts in the sync mpm setups

Modified:
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1727963&r1=1727962&r2=1727963&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Feb  1 16:19:10 2016
@@ -2071,7 +2071,10 @@ apr_status_t h2_session_process(h2_sessi
                 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;