Commit 0340ce9b authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1766129 from trunk: 

Fix -Wunused-but-set-variable warnings.


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

modules/http2/h2_session.c

+0 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,6 @@ static apr_status_t on_stream_headers(h2_session *session, h2_stream *stream, 
    }

    else if (stream->has_response) {

        h2_ngheader *nh;

        int rv;

        

        nh = h2_util_ngheader_make(stream->pool, headers->headers);

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03072)

modules/http2/h2_stream.c

+3 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ int h2_stream_is_scheduled(const h2_stream *stream) 
apr_status_t h2_stream_close_input(h2_stream *stream)

{

    conn_rec *c = stream->session->c;

    apr_status_t status = APR_SUCCESS;

    apr_status_t status = APR_SUCCESS, rv;



    ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, stream->session->c,

                  "h2_stream(%ld-%d): closing input",
@@ -477,7 +477,8 @@ apr_status_t h2_stream_close_input(h2_stream *stream) 
    }

    

    close_input(stream);

    return h2_beam_close(stream->input);

    rv = h2_beam_close(stream->input);

    return status ? status : rv;

}



apr_status_t h2_stream_write_data(h2_stream *stream,