Commit cf465574 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Backport 

Merge r1749151 from trunk:

mod_http2: fix for request abort when connections drops, introduced in 1.5.8
Submitted by: icing
Reviewed/backported by: jim


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

CHANGES

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


Changes with Apache 2.4.22



  *) mod_http2: fix for request abort when connections drops, introduced in

     1.5.8



Changes with Apache 2.4.21



  *) mod_http2: more rigid error handling in DATA frame assembly, leading

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -146,11 +146,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x: trunk patch works

     +1: elukey



  *) mod_http2: fix for request abort when connections drops, introduced in 1.5.8

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

     2.4.x: trunk patch works

     +1: jim



PATCHES/ISSUES THAT ARE BEING WORKED



  *) http: Don't remove the Content-Length of zero from a HEAD response if

modules/http2/h2_mplx.c

+3 −0
Original line number Diff line number Diff line
@@ -436,6 +436,9 @@ static void stream_done(h2_mplx *m, h2_stream *stream, int rst_error) 
    if (stream->input) {

        m->tx_handles_reserved += h2_beam_get_files_beamed(stream->input);

        h2_beam_on_consumed(stream->input, NULL, NULL);

        /* Let anyone blocked reading know that there is no more to come */

        h2_beam_abort(stream->input);

        /* Remove mutex after, so that abort still finds cond to signal */

        h2_beam_mutex_set(stream->input, NULL, NULL, NULL);

    }

    h2_stream_cleanup(stream);