Commit 61ecdd30 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

Merge of 1736463 from trunk: 

mod_http2: fix for scoreboard updates missing, mem leak fix for slave connections


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.20



  *) mod_http2: fix for missing score board updates on request count, fix for

     memory leak on slave connection reuse.

     

  *) mod_http2: Fix build on Windows from dsp files.

     [Stefan Eissing]

modules/http2/h2_io.c

+0 −10
Original line number Diff line number Diff line
@@ -425,16 +425,6 @@ apr_status_t h2_io_out_write(h2_io *io, apr_bucket_brigade *bb, 
        return APR_ECONNABORTED;

    }



    if (io->eos_out) {

        apr_off_t len = 0;

        /* We have already delivered an EOS bucket to a reader, no

         * sense in storing anything more here.

         */

        apr_brigade_length(bb, 0, &len);

        apr_brigade_cleanup(bb);

        return (len > 0)? APR_EOF : APR_SUCCESS;

    }



    /* Filter the EOR bucket and set it aside. We prefer to tear down

     * the request when the whole h2 stream is done */

    for (b = APR_BRIGADE_FIRST(bb);

modules/http2/h2_mplx.c

+9 −7
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ static int io_out_consumed_signal(h2_mplx *m, h2_io *io) 


static void io_destroy(h2_mplx *m, h2_io *io, int events)

{

    int reuse_slave;

    

    /* cleanup any buffered input */

    h2_io_in_shutdown(io);

    if (events) {
@@ -297,12 +299,16 @@ static void io_destroy(h2_mplx *m, h2_io *io, int events) 
        h2_io_set_remove(m->redo_ios, io);

    }



    reuse_slave = ((m->spare_slaves->nelts < m->spare_slaves->nalloc)

                    && !io->rst_error && io->eor);

    if (io->task) {

        conn_rec *slave = io->task->c;

        h2_task_destroy(io->task);

        io->task = NULL;

        

        if (m->spare_slaves->nelts < m->spare_slaves->nalloc) {

        if (reuse_slave) {

            apr_bucket_delete(io->eor);

            io->eor = NULL;

            APR_ARRAY_PUSH(m->spare_slaves, conn_rec*) = slave;

        }

        else {
@@ -310,10 +316,6 @@ static void io_destroy(h2_mplx *m, h2_io *io, int events) 
        }

    }



    if (io->eor) {

        apr_bucket_delete(io->eor);

        io->eor = NULL;

    }

    if (io->pool) {

        apr_pool_destroy(io->pool);

    }
@@ -1121,6 +1123,8 @@ h2_task *h2_mplx_pop_task(h2_mplx *m, int *has_more) 
static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn)

{

    if (task) {

        h2_io *io = h2_io_set_get(m->stream_ios, task->stream_id);

        

        if (task->frozen) {

            /* this task was handed over to an engine for processing 

             * and the original worker has finished. That means the
@@ -1133,8 +1137,6 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) 
            apr_thread_cond_broadcast(m->task_thawed);

        }

        else {

            h2_io *io = h2_io_set_get(m->stream_ios, task->stream_id);

            

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

                          "h2_mplx(%ld): task(%s) done", m->id, task->id);

            /* clean our references and report request as done. Signal

modules/http2/h2_task.c

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static apr_status_t h2_task_process_request(h2_task *task, conn_rec *c) 
                      "h2_task(%s): create request_rec failed, r->status=%d", 

                      task->id, r->status);

    }

    c->sbh = NULL;



    return APR_SUCCESS;

}

modules/http2/h2_task_output.c

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <http_core.h>

#include <http_log.h>

#include <http_connection.h>

#include <http_request.h>



#include "h2_private.h"

#include "h2_conn.h"
@@ -136,6 +137,7 @@ static apr_status_t write_brigade_raw(h2_task_output *output, 
apr_status_t h2_task_output_write(h2_task_output *output,

                                  ap_filter_t* f, apr_bucket_brigade* bb)

{

    apr_bucket *b;

    apr_status_t status = APR_SUCCESS;

    

    if (APR_BRIGADE_EMPTY(bb)) {
@@ -147,6 +149,16 @@ apr_status_t h2_task_output_write(h2_task_output *output, 
    if (output->task->frozen) {

        h2_util_bb_log(output->task->c, output->task->stream_id, APLOG_TRACE2,

                       "frozen task output write, ignored", bb);

        while (!APR_BRIGADE_EMPTY(bb)) {

            b = APR_BRIGADE_FIRST(bb);

            if (AP_BUCKET_IS_EOR(b)) {

                /* TODO: keep it */

                APR_BUCKET_REMOVE(b);

            }

            else {

                apr_bucket_delete(b);

            }

        }

        return APR_SUCCESS;

    }