Commit b8048743 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

mod_http2: enable re-use of slave connections again. 


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

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mod_http2: enable re-use of slave connections again. [Stefan Eissing]



  *) mod_proxy_wstunnel: Fix websocket proxy over UDS.

     PR 62932 <pavel dcmsys.com>

modules/http2/h2_conn.c

+1 −2
Changes for modules/http2/h2_conn.c: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ apr_status_t h2_slave_run_pre_connection(conn_rec *slave, apr_socket_t *csd) 
         * (Not necessarily in pre_connection, but later. Set it here, so it

         * is in place.) */

        slave->keepalives = 1;

    }

    /* We signal that this connection will be closed after the request.

     * Which is true in that sense that we throw away all traffic data

     * on this slave connection after each requests. Although we might
@@ -381,6 +382,4 @@ apr_status_t h2_slave_run_pre_connection(conn_rec *slave, apr_socket_t *csd) 
    slave->keepalive = AP_CONN_CLOSE;

    return ap_run_pre_connection(slave, csd);

}

    return APR_SUCCESS;

}

modules/http2/h2_mplx.c

+2 −1
Changes for modules/http2/h2_mplx.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ static int stream_destroy_iter(void *ctx, void *val) 
                               && !task->rst_error);

            }

            

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

            task->c = NULL;

            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

+0 −1
Changes for modules/http2/h2_task.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ h2_task *h2_task_create(conn_rec *slave, int stream_id, 
void h2_task_destroy(h2_task *task)

{

    if (task->output.beam) {

        h2_beam_log(task->output.beam, task->c, APLOG_TRACE2, "task_destroy");

        h2_beam_destroy(task->output.beam);

        task->output.beam = NULL;

    }