Commit 9ceed38d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1852038, r1852101 from trunk: 

mod_http2: enable re-use of slave connections again.


mod_http2: fixed slave connection keepalives counter.

Submitted by: icing
Reviewed by: icing, ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855406 13f79535-47bb-0310-9956-ffa450edef68
parent 1479eadd

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ Changes with Apache 2.4.39 
     credentials could be refused in case of concurrent accesses from

     different users.  PR 63124.  [Simon Kappel <simon.kappel axis.com>]



  *) mod_http2: enable re-use of slave connections again. Fixed slave connection

     keepalives counter. [Stefan Eissing]



  *) mod_proxy_wstunnel: Fix websocket proxy over UDS.

     PR 62932 <pavel dcmsys.com>

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -145,15 +145,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
                  (trunk works, modulo CHANGES)

     +1: ylavic, icing, jim



  *) mod_http2: enable re-use of slave connections again. Fixed slave connection

     keepalives counter. [Stefan Eissing]

     trunk patch: http://svn.apache.org/r1852038

                  http://svn.apache.org/r1852101

     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-slave-keepalives.patch

     +1: icing, ylavic, jim







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/http2/h2_conn.c

+9 −5
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ conn_rec *h2_slave_create(conn_rec *master, int slave_id, apr_pool_t *parent) 
    c->notes                  = apr_table_make(pool, 5);

    c->input_filters          = NULL;

    c->output_filters         = NULL;

    c->keepalives             = 0;

#if AP_MODULE_MAGIC_AT_LEAST(20180903, 1)

    c->filter_conn_ctx        = NULL;

#endif

    c->bucket_alloc           = apr_bucket_alloc_create(pool);

    c->data_in_input_filters  = 0;

    c->data_in_output_filters = 0;
@@ -332,16 +336,15 @@ conn_rec *h2_slave_create(conn_rec *master, int slave_id, apr_pool_t *parent) 
        ap_set_module_config(c->conn_config, mpm, cfg);

    }



    ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, 

                  "h2_stream(%ld-%d): created slave", master->id, slave_id);

    ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, c, 

                  "h2_slave(%s): created", c->log_id);

    return c;

}



void h2_slave_destroy(conn_rec *slave)

{

    ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, slave,

                  "h2_stream(%s): destroy slave", 

                  apr_table_get(slave->notes, H2_TASK_ID_NOTE));

    ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, slave,

                  "h2_slave(%s): destroy", slave->log_id);

    slave->sbh = NULL;

    apr_pool_destroy(slave->pool);

}
@@ -365,6 +368,7 @@ 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);

    }

    ap_assert(slave->output_filters);

    return APR_SUCCESS;

}

modules/http2/h2_mplx.c

+7 −1
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);
@@ -437,6 +438,8 @@ void h2_mplx_release_and_join(h2_mplx *m, apr_thread_cond_t *wait) 
    apr_status_t status;

    int i, wait_secs = 60;



    ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c,

                  "h2_mplx(%ld): start release", m->id);

    /* How to shut down a h2 connection:

     * 0. abort and tell the workers that no more tasks will come from us */

    m->aborted = 1;
@@ -977,6 +980,9 @@ static apr_status_t unschedule_slow_tasks(h2_mplx *m) 
     */

    n = (m->tasks_active - m->limit_active - (int)h2_ihash_count(m->sredo));

    while (n > 0 && (stream = get_latest_repeatable_unsubmitted_stream(m))) {

        ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, 

                      "h2_mplx(%s): unschedule, resetting task for redo later",

                      stream->task->id);

        h2_task_rst(stream->task, H2_ERR_CANCEL);

        h2_ihash_add(m->sredo, stream);

        --n;

modules/http2/h2_task.c

+1 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int h2_task_pre_conn(conn_rec* c, void *arg) 
    (void)arg;

    if (h2_ctx_is_task(ctx)) {

        ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c,

                      "h2_h2, pre_connection, found stream task");

                      "h2_slave(%s), pre_connection, adding filters", c->log_id);

        ap_add_input_filter("H2_SLAVE_IN", NULL, NULL, c);

        ap_add_output_filter("H2_PARSE_H1", NULL, NULL, c);

        ap_add_output_filter("H2_SLAVE_OUT", NULL, NULL, c);
@@ -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;

    }