You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/09/19 10:23:46 UTC
svn commit: r1761419 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c
native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: markt
Date: Mon Sep 19 10:23:46 2016
New Revision: 1761419
URL: http://svn.apache.org/viewvc?rev=1761419&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59184
HTTPD: Avoid segmentation fault if mod_jk is configured with an invalid value for JkShmFile. This causes the server startup to fail.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1761419&r1=1761418&r2=1761419&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Mon Sep 19 10:23:46 2016
@@ -3287,9 +3287,9 @@ static void jk_init(server_rec * s, ap_p
"You can remove the JkShmSize directive if you want to use the optimal size.");
}
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0) {
- jk_log(conf->log, JK_LOG_ERROR,
- "Initializing shm:%s errno=%d. Load balancing workers will not function properly.",
- jk_shm_name(), rc);
+ jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
+ "Initializing shm:%s errno=%d. Unable to start due to shared memory failure.",
+ jk_shm_name(), rc);
}
/* SREVILAK -- register cleanup handler to clear resources on restart,
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1761419&r1=1761418&r2=1761419&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Sep 19 10:23:46 2016
@@ -3575,9 +3575,9 @@ static int init_jk(apr_pool_t * pconf, j
apr_pool_cleanup_null);
}
else {
- jk_log(conf->log, JK_LOG_ERROR,
- "Initializing shm:%s errno=%d. Load balancing workers will not function properly.",
- jk_shm_name(), rc);
+ jk_error_exit(JKLOG_MARK, APLOG_EMERG, s, s->process->pool,
+ "Initializing shm:%s errno=%d. Unable to start due to shared memory failure.",
+ jk_shm_name(), rc);
}
/* we add the URI->WORKER MAP since workers using AJP14
will feed it */
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1761419&r1=1761418&r2=1761419&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 19 10:23:46 2016
@@ -101,6 +101,11 @@
specified for the worker that cannot be resolved to an IP address.
(markt)
</fix>
+ <fix>
+ <bug>59184</bug>: HTTPD: Avoid segmentation fault if mod_jk is
+ configured with an invalid value for JkShmFile. This causes the server
+ startup to fail. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org