Author: rjung
Date: Sun Mar 25 12:49:10 2012
New Revision: 1305022
URL: http://svn.apache.org/viewvc?rev=1305022&view=rev
Log:
BZ 46893: Apply fix to HTTPD 1.3.
It was fixed for HTTPD 2.x already in version 1.2.30
but never added to the HTTPD 1.3 mod_jk..
Modified:
tomcat/jk/trunk/native/apache-1.3/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=1305022&r1=1305021&r2=1305022&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 12:49:10 2012
@@ -257,6 +257,7 @@ static table *jk_log_fds = NULL;
static jk_worker_env_t worker_env;
static char *jk_shm_file = NULL;
static size_t jk_shm_size = 0;
+static int jk_shm_size_set = 0;
/*
* Worker stuff
*/
@@ -1348,6 +1349,8 @@ static const char *jk_set_shm_size(cmd_p
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = (size_t)sz;
+ if (jk_shm_size)
+ jk_shm_size_set = 1;
return NULL;
}
@@ -3037,7 +3040,7 @@ static void jk_init(server_rec * s, ap_p
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=1305022&r1=1305021&r2=1305022&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Mar 25 12:49:10 2012
@@ -44,7 +44,12 @@
<br />
<subsection name="Native">
<changelog>
- <fix>Fix compilation of mod_jk for HTTPD 1.3. (rjung)
+ <fix>
+ Fix compilation of mod_jk for HTTPD 1.3. (rjung)
+ </fix>
+ <fix>
+ <bug>46893</bug>: HTTPD 1.3: Apply fix to HTTPD 1.3.
+ It was fixed for HTTPD 2.x already in version 1.2.30. (rjung)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
