httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1733276 - in /httpd/httpd/branches/2.4.x/modules/http2: h2_mplx.c h2_session.c h2_version.h
Date Wed, 02 Mar 2016 12:54:07 GMT
Author: icing
Date: Wed Mar  2 12:54:07 2016
New Revision: 1733276

URL: http://svn.apache.org/viewvc?rev=1733276&view=rev
Log:
mod_http2: fixing max conneciton workers when H2MaxWorkers is not configured

Modified:
    httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_session.c
    httpd/httpd/branches/2.4.x/modules/http2/h2_version.h

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c?rev=1733276&r1=1733275&r2=1733276&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_mplx.c Wed Mar  2 12:54:07 2016
@@ -209,7 +209,7 @@ h2_mplx *h2_mplx_create(conn_rec *c, apr
         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();

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_session.c?rev=1733276&r1=1733275&r2=1733276&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_session.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_session.c Wed Mar  2 12:54:07 2016
@@ -885,9 +885,15 @@ static h2_session *h2_session_create_int
         
         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;

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_version.h?rev=1733276&r1=1733275&r2=1733276&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_version.h (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_version.h Wed Mar  2 12:54:07 2016
@@ -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 */



Mime
View raw message