Commit 759c0ec4 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

Merge of r1764005 from trunk: 

mod_http2: reverting int->apr_uint32_t changes from 1.7.x


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

modules/http2/h2.h

+5 −5
Original line number Diff line number Diff line
@@ -101,11 +101,11 @@ typedef enum { 
} h2_session_state;



typedef struct h2_session_props {

    apr_uint32_t accepted_max;      /* the highest remote stream id was/will be handled */

    apr_uint32_t completed_max;     /* the highest remote stream completed */

    apr_uint32_t emitted_count;     /* the number of local streams sent */

    apr_uint32_t emitted_max;       /* the highest local stream id sent */

    apr_uint32_t error;             /* the last session error encountered */

    int accepted_max;      /* the highest remote stream id was/will be handled */

    int completed_max;     /* the highest remote stream completed */

    int emitted_count;     /* the number of local streams sent */

    int emitted_max;       /* the highest local stream id sent */

    int error;             /* the last session error encountered */

    unsigned int accepting : 1;     /* if the session is accepting new streams */

    unsigned int shutdown : 1;      /* if the final GOAWAY has been sent */

} h2_session_props;

modules/http2/h2_bucket_beam.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ apr_status_t h2_beam_destroy(h2_bucket_beam *beam) 
}



apr_status_t h2_beam_create(h2_bucket_beam **pbeam, apr_pool_t *red_pool, 

                            apr_uint32_t id, const char *tag, 

                            int id, const char *tag, 

                            apr_size_t max_buf_size)

{

    h2_bucket_beam *beam;

modules/http2/h2_bucket_beam.h

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ typedef int h2_beam_can_beam_callback(void *ctx, h2_bucket_beam *beam, 
int h2_beam_no_files(void *ctx, h2_bucket_beam *beam, apr_file_t *file);



struct h2_bucket_beam {

    apr_uint32_t id;

    int id;

    const char *tag;

    h2_blist red;

    h2_blist hold;
@@ -223,7 +223,7 @@ struct h2_bucket_beam { 
 */

apr_status_t h2_beam_create(h2_bucket_beam **pbeam,

                            apr_pool_t *red_pool, 

                            apr_uint32_t id, const char *tag, 

                            int id, const char *tag, 

                            apr_size_t buffer_size);



/**

modules/http2/h2_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ apr_status_t h2_conn_pre_close(struct h2_ctx *ctx, conn_rec *c) 
    return status;

}



conn_rec *h2_slave_create(conn_rec *master, apr_uint32_t slave_id, 

conn_rec *h2_slave_create(conn_rec *master, int slave_id, 

                          apr_pool_t *parent, apr_allocator_t *allocator)

{

    apr_pool_t *pool;

modules/http2/h2_conn.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ typedef enum { 
h2_mpm_type_t h2_conn_mpm_type(void);





conn_rec *h2_slave_create(conn_rec *master, apr_uint32_t slave_id, 

conn_rec *h2_slave_create(conn_rec *master, int slave_id, 

                          apr_pool_t *parent, apr_allocator_t *allocator);

void h2_slave_destroy(conn_rec *slave, apr_allocator_t **pallocator);