On 07/03/2019 03:46 PM, ic...@apache.org wrote:
> Author: icing
> Date: Wed Jul 3 13:46:31 2019
> New Revision: 1862475
>
> URL: http://svn.apache.org/viewvc?rev=1862475&view=rev
> Log:
> *) 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]
>
>
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/modules/http2/h2_conn.c
> httpd/httpd/trunk/modules/http2/h2_version.h
> httpd/httpd/trunk/server/mpm/event/event.c
>
> Modified: httpd/httpd/trunk/server/mpm/event/event.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1862475&r1=1862474&r2=1862475&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/event/event.c (original)
> +++ httpd/httpd/trunk/server/mpm/event/event.c Wed Jul 3 13:46:31 2019
> @@ -1153,10 +1153,11 @@ read_request:
> else if (ap_filter_should_yield(c->output_filters)) {
> pending = OK;
> }
> - if (pending == OK) {
> + if (pending == OK || (pending == DECLINED &&
> + cs->pub.sense == CONN_SENSE_WANT_READ)) {
Sorry for being devils advocate here and I may be completely off, but are we
sure that
cs->pub.sense is still CONN_SENSE_WANT_READ when we get here in all cases?
If my memory is correct the cs->pub.sense with CONN_SENSE_WANT_READ /
CONN_SENSE_WANT_WRITE
was introduced as HTTP state might be writing or reading, but the underlying
SSL needs just the
opposite due to the state the SSL protocol is in.
To be honest I did not have the time to dig deeper, but without further
research it might happen
that mod_ssl flips this around to CONN_SENSE_WANT_WRITE.
More than happy to be proven wrong :-)
Regards
Rüdiger
