Author: mturk
Date: Mon Dec 21 08:03:15 2009
New Revision: 892719
URL: http://svn.apache.org/viewvc?rev=892719&view=rev
Log:
Fix #46893 by monitoring if the JkShmSize was used
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
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=892719&r1=892718&r2=892719&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 21 08:03:15 2009
@@ -253,6 +253,7 @@
static apr_global_mutex_t *jk_log_lock = NULL;
static char *jk_shm_file = NULL;
static size_t jk_shm_size = 0;
+static int jk_shm_size_set = 0;
static volatile int jk_watchdog_interval = 0;
static volatile int jk_watchdog_running = 0;
@@ -1315,6 +1316,8 @@
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = (size_t)sz;
+ if (jk_shm_size)
+ jk_shm_size_set = 1;
return NULL;
}
@@ -3152,7 +3155,7 @@
#endif
if (jk_shm_size == 0)
jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
- else {
+ else if (jk_shm_size_set) {
jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined
automatically.");
jk_log(conf->log, JK_LOG_WARNING,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892719&r1=892718&r2=892719&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 08:03:15 2009
@@ -44,6 +44,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>46893</bug>: Httpd: Log warning only if JkShmSize was actually
+ set in the configuration. (mturk)
+ </fix>
+ <fix>
<bug>48410</bug>: Use poll instead select so we can work with more.
then 1024 sockets. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
