Commit 3361b5cd authored by Stefan Eissing's avatar Stefan Eissing
Browse files

update to mod_http2 1.0.7-DEV 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4-http2-alpha@1716203 13f79535-47bb-0310-9956-ffa450edef68
parent 3aa5ba4d

modules/http2/config.m4

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ AC_DEFUN([APACHE_CHECK_NGHTTP2],[ 
      if test "x$liberrors" != "x"; then

        AC_MSG_WARN([nghttp2 library is unusable])

      fi

      AC_CHECK_FUNCS([nghttp2_session_change_stream_priority], 

        [APR_ADDTO(MOD_CPPFLAGS, ["-DH2_NG2_CHANGE_PRIO"])], [])

    else

      AC_MSG_WARN([nghttp2 version is too old])

    fi

modules/http2/h2_from_h1.c

+1 −5
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ h2_from_h1 *h2_from_h1_create(int stream_id, apr_pool_t *pool) 


apr_status_t h2_from_h1_destroy(h2_from_h1 *from_h1)

{

    if (from_h1->response) {

        h2_response_destroy(from_h1->response);

        from_h1->response = NULL;

    }

    from_h1->bb = NULL;

    return APR_SUCCESS;

}
@@ -520,7 +516,7 @@ apr_status_t h2_response_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
    if (eb) {

        int st = eb->status;

        apr_brigade_cleanup(bb);

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, f->c,

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c,

                      "h2_from_h1(%d): err bucket status=%d", 

                      from_h1->stream_id, st);

        ap_die(st, r);

modules/http2/h2_h2.h

+11 −0
Original line number Diff line number Diff line
@@ -58,6 +58,17 @@ extern const char *H2_MAGIC_TOKEN; 


#define H2_STREAM_CLIENT_INITIATED(id)      (id&0x01)



typedef enum {

    H2_DEPENDANT_AFTER,

    H2_DEPENDANT_INTERLEAVED,

    H2_DEPENDANT_BEFORE,

} h2_dependency;



typedef struct h2_priority {

    h2_dependency dependency;

    int           weight;

} h2_priority;



/**

 * Provide a user readable description of the HTTP/2 error code-

 * @param h2_error http/2 error code, as in rfc 7540, ch. 7

modules/http2/h2_io.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void h2_io_set_response(h2_io *io, h2_response *response) 
    AP_DEBUG_ASSERT(io->pool);

    AP_DEBUG_ASSERT(response);

    AP_DEBUG_ASSERT(!io->response);

    io->response = h2_response_copy(io->pool, response);

    io->response = h2_response_clone(io->pool, response);

    if (response->rst_error) {

        h2_io_rst(io, response->rst_error);

    }

modules/http2/h2_mplx.c

+2 −2
Original line number Diff line number Diff line
@@ -711,8 +711,8 @@ apr_status_t h2_mplx_out_close(h2_mplx *m, int stream_id, apr_table_t *trailers) 
                     * insert an error one so that our streams can properly

                     * reset.

                     */

                    h2_response *r = h2_response_create(stream_id, 0, 

                                                        500, NULL, m->pool);

                    h2_response *r = h2_response_die(stream_id, APR_EGENERAL, 

                                                     io->request, m->pool);

                    status = out_open(m, stream_id, r, NULL, NULL, NULL);

                    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c,

                                  "h2_mplx(%ld-%d): close, no response, no rst",