Commit 2afdc4b8 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the trunk: 

mod_http2 after review by Christophe:
  * fix h2_fifo_peek to properly block
  * check peek return status while processing mplx queue



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

modules/http2/h2_util.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ static apr_status_t fifo_peek(h2_fifo *fifo, h2_fifo_peek_fn *fn, void *ctx, int 


apr_status_t h2_fifo_peek(h2_fifo *fifo, h2_fifo_peek_fn *fn, void *ctx)

{

    return fifo_peek(fifo, fn, ctx, 0);

    return fifo_peek(fifo, fn, ctx, 1);

}



apr_status_t h2_fifo_try_peek(h2_fifo *fifo, h2_fifo_peek_fn *fn, void *ctx)

modules/http2/h2_workers.c

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ static apr_status_t get_next(h2_slot *slot) 
    while (!slot->aborted) {

        if (!slot->task) {

            status = h2_fifo_try_peek(workers->mplxs, mplx_peek, slot);

            if (status == APR_EOF) {

                return status;

            }

        }

        

        if (slot->task) {