Commit 28dcf6bc authored by Stefan Eissing's avatar Stefan Eissing
Browse files

mod_http2: fix for latest mod_reqtimeout change re handshake timeouts 


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

modules/http2/h2_mplx.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int stream_destroy_iter(void *ctx, void *val) 
                               && !task->rst_error);

            }

            

            if (reuse_slave && slave->keepalive == AP_CONN_KEEPALIVE) {

            if (reuse_slave) {

                h2_beam_log(task->output.beam, m->c, APLOG_DEBUG, 

                            APLOGNO(03385) "h2_task_destroy, reuse slave");    

                h2_task_destroy(task);

modules/http2/h2_task.c

+2 −5
Original line number Diff line number Diff line
@@ -310,11 +310,9 @@ static apr_status_t h2_filter_slave_in(ap_filter_t* f, 
        }

    }

    

    /* Nothing there, no more data to get. Return APR_EAGAIN on

     * speculative reads, this is ap_check_pipeline()'s trick to

     * see if the connection needs closing. */

    /* Nothing there, no more data to get. Return. */

    if (status == APR_EOF && APR_BRIGADE_EMPTY(task->input.bb)) {

        return (mode == AP_MODE_SPECULATIVE)? APR_EAGAIN : APR_EOF;

        return status;

    }



    if (trace1) {
@@ -600,7 +598,6 @@ apr_status_t h2_task_do(h2_task *task, apr_thread_t *thread, int worker_id) 
            slave_id = worker_id; 

        }

        task->c->id = (c->master->id << free_bits)^slave_id;

        c->keepalive = AP_CONN_KEEPALIVE;

    }

        

    h2_beam_create(&task->output.beam, c->pool, task->stream_id, "output",