Commit 4b98d0c4 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

mod_http2: fixing max conneciton workers when H2MaxWorkers is not configured 

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

modules/http2/h2_mplx.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ h2_mplx *h2_mplx_create(conn_rec *c, apr_pool_t *parent, 
        m->stream_max_mem = h2_config_geti(conf, H2_CONF_STREAM_MAX_MEM);

        m->stream_timeout = stream_timeout;

        m->workers = workers;

        m->workers_max = h2_config_geti(conf, H2_CONF_MAX_WORKERS);

        m->workers_max = workers->max_workers;

        m->workers_def_limit = 4;

        m->workers_limit = m->workers_def_limit;

        m->last_limit_change = m->last_idle_block = apr_time_now();

modules/http2/h2_session.c

+9 −3
Original line number Diff line number Diff line
@@ -885,9 +885,15 @@ static h2_session *h2_session_create_int(conn_rec *c, 
        

        if (APLOGcdebug(c)) {

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03200)

                          "session(%ld) created, max_streams=%d, stream_mem=%d, push_diary(type=%d,N=%d)",

                          session->id, (int)session->max_stream_count, (int)session->max_stream_mem,

                          session->push_diary->dtype, (int)session->push_diary->N);

                          "h2_session(%ld) created, max_streams=%d, "

                          "stream_mem=%d, workers_limit=%d, workers_max=%d, "

                          "push_diary(type=%d,N=%d)",

                          session->id, (int)session->max_stream_count, 

                          (int)session->max_stream_mem,

                          session->mplx->workers_limit, 

                          session->mplx->workers_max, 

                          session->push_diary->dtype, 

                          (int)session->push_diary->N);

        }

    }

    return session;

modules/http2/h2_version.h

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

 * Version number of the http2 module as c string

 */

#define MOD_HTTP2_VERSION "1.3.2"

#define MOD_HTTP2_VERSION "1.3.3"



/**

 * @macro
@@ -34,7 +34,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 0x010302

#define MOD_HTTP2_VERSION_NUM 0x010303





#endif /* mod_h2_h2_version_h */