Attachment 36642 Details for Bug 63534 – 2.4.x patch v2

[patch] 2.4.x patch v2

h2-keepalive-yann-v2.patch (text/plain), 2.71 KB, created by Stefan Eissing on 2019-07-03 14:08:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Eissing

Created: 2019-07-03 14:08:16 UTC

Size: 2.71 KB

patch

obsolete

>Index: CHANGES
>===================================================================
>--- CHANGES	(revision 1862475)
>+++ CHANGES	(working copy)
>@@ -1,6 +1,11 @@
>                                                          -*- coding: utf-8 -*-
> Changes with Apache 2.4.40
> 
>+  *) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
>+     more to write with streams ongoing (flow control block). The timeout waiting
>+     for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
>+     Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]
>+
>   *) mod_proxy_http2: fixing a potential NULL pointer use in logging.
>      [Christophe Jaillet <christophe.jaillet wanadoo.fr>, Dr Silvio Cesare InfoSect]
> 
>Index: modules/http2/h2_conn.c
>===================================================================
>--- modules/http2/h2_conn.c	(revision 1862475)
>+++ modules/http2/h2_conn.c	(working copy)
>@@ -231,6 +231,13 @@
>             case H2_SESSION_ST_BUSY:
>             case H2_SESSION_ST_WAIT:
>                 c->cs->state = CONN_STATE_WRITE_COMPLETION;
>+                if (c->cs && (session->open_streams || !session->remote.emitted_count)) {
>+                    /* let the MPM know that we are not done and want
>+                     * the Timeout behaviour instead of a KeepAliveTimeout
>+                     * See PR 63534. 
>+                     */
>+                    c->cs->sense = CONN_SENSE_WANT_READ;
>+                }
>                 break;
>             case H2_SESSION_ST_CLEANUP:
>             case H2_SESSION_ST_DONE:
>Index: server/mpm/event/event.c
>===================================================================
>--- server/mpm/event/event.c	(revision 1862475)
>+++ server/mpm/event/event.c	(working copy)
>@@ -1113,10 +1113,11 @@
>                           "network write failure in core output filter");
>             cs->pub.state = CONN_STATE_LINGER;
>         }
>-        else if (c->data_in_output_filters) {
>+        else if (c->data_in_output_filters 
>+            || cs->pub.sense == CONN_SENSE_WANT_READ) {
>             /* Still in WRITE_COMPLETION_STATE:
>-             * Set a write timeout for this connection, and let the
>-             * event thread poll for writeability.
>+             * Set a read/write timeout for this connection, and let the
>+             * event thread poll for read/writeability.
>              */
>             cs->queue_timestamp = apr_time_now();
>             notify_suspend(cs);
>Index: .
>===================================================================
>--- .	(revision 1862475)
>+++ .	(working copy)
>
>Property changes on: .
>___________________________________________________________________
>Modified: svn:mergeinfo
>## -0,0 +0,1 ##
>   Merged /httpd/httpd/trunk:r1862475

Actions: View | Diff

Attachments on bug 63534: 36639 | 36640 | 36642 | 36644 | 36645