Commit 3dc58382 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

* mod_http2: adding support for the new trailer tests. 



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

modules/http2/h2_filter.c

+50 −2
Original line number Diff line number Diff line
@@ -493,6 +493,52 @@ static apr_status_t status_event(void *ctx, h2_bucket_event event, 
    return APR_SUCCESS;

}



static apr_status_t discard_body(request_rec *r, apr_off_t maxlen)

{

    apr_bucket_brigade *bb;

    int seen_eos;

    apr_status_t rv;



    bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);

    seen_eos = 0;

    do {

        apr_bucket *bucket;



        rv = ap_get_brigade(r->input_filters, bb, AP_MODE_READBYTES,

                            APR_BLOCK_READ, HUGE_STRING_LEN);



        if (rv != APR_SUCCESS) {

            apr_brigade_destroy(bb);

            return rv;

        }



        for (bucket = APR_BRIGADE_FIRST(bb);

             bucket != APR_BRIGADE_SENTINEL(bb);

             bucket = APR_BUCKET_NEXT(bucket))

        {

            const char *data;

            apr_size_t len;



            if (APR_BUCKET_IS_EOS(bucket)) {

                seen_eos = 1;

                break;

            }

            if (bucket->length == 0) {

                continue;

            }

            rv = apr_bucket_read(bucket, &data, &len, APR_BLOCK_READ);

            if (rv != APR_SUCCESS) {

                apr_brigade_destroy(bb);

                return rv;

            }

            maxlen -= bucket->length;

        }

        apr_brigade_cleanup(bb);

    } while (!seen_eos && maxlen >= 0);



    return APR_SUCCESS;

}



int h2_filter_h2_status_handler(request_rec *r)

{

    conn_rec *c = r->connection;
@@ -510,8 +556,10 @@ int h2_filter_h2_status_handler(request_rec *r) 


    task = h2_ctx_get_task(r->connection);

    if (task) {



        if ((status = ap_discard_request_body(r)) != OK) {

        /* In this handler, we do some special sauce to send footers back,

         * IFF we received footers in the request. This is used in our test

         * cases, since CGI has no way of handling those. */

        if ((status = discard_body(r, 1024)) != OK) {

            return status;

        }

modules/http2/h2_stream.c

+2 −0
Original line number Diff line number Diff line
@@ -683,6 +683,8 @@ static apr_status_t add_trailer(h2_stream *stream, 
    hvalue = apr_pstrndup(stream->pool, value, vlen);

    h2_util_camel_case_header(hname, nlen);

    apr_table_mergen(stream->trailers, hname, hvalue);

    ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, 

                  H2_STRM_MSG(stream, "added trailer '%s: %s'"), hname, hvalue);

    

    return APR_SUCCESS;

}

modules/http2/h2_version.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * @macro

 * Version number of the http2 module as c string

 */

#define MOD_HTTP2_VERSION "1.15.1"

#define MOD_HTTP2_VERSION "1.15.2"



/**

 * @macro
@@ -35,7 +35,7 @@ 
 * release. This is a 24 bit number with 8 bits for major number, 8 bits

 * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.

 */

#define MOD_HTTP2_VERSION_NUM 0x010f01

#define MOD_HTTP2_VERSION_NUM 0x010f02





#endif /* mod_h2_h2_version_h */