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

On the trunk: 

mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
     the session in continuous check for state changes that never happen. 



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

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep

     the session in continuous check for state changes that never happen. 

     [Stefan Eissing]



  *) Evaluate nested If/ElseIf/Else configuration blocks.

     [Luca Toscano, Jacob Champion]

modules/http2/h2_mplx.c

+16 −12
Original line number Diff line number Diff line
@@ -1057,7 +1057,9 @@ apr_status_t h2_mplx_idle(h2_mplx *m) 
                          "h2_mplx(%ld): idle, no tasks ongoing, %d streams",

                          m->id, (int)h2_ihash_count(m->streams));

            h2_ihash_shift(m->streams, (void**)&stream, 1);

            if (stream && stream->output) {

            if (stream) {

                h2_ihash_add(m->streams, stream);

                if (stream->output && !stream->out_checked) {

                    /* FIXME: this looks like a race between the session thinking

                     * it is idle and the EOF on a stream not being sent.

                     * Signal to caller to leave IDLE state.
@@ -1069,10 +1071,12 @@ apr_status_t h2_mplx_idle(h2_mplx *m) 
                                  (long)h2_beam_get_buffered(stream->output));

                    h2_ihash_add(m->streams, stream);

                    check_data_for(m, stream, 0);

                    stream->out_checked = 1;

                    status = APR_EAGAIN;

                }

            }

        }

    }

    register_if_needed(m);



    H2_MPLX_LEAVE(m);

modules/http2/h2_stream.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct h2_stream { 
    unsigned int scheduled : 1; /* stream has been scheduled */

    unsigned int has_response : 1; /* response headers are known */

    unsigned int input_eof : 1; /* no more request data coming */

    unsigned int out_checked : 1; /* output eof was double checked */

    unsigned int push_policy;   /* which push policy to use for this request */

    

    struct h2_task *task;       /* assigned task to fullfill request */