Author: mturk
Date: Mon Dec 21 11:24:21 2009
New Revision: 892769
URL: http://svn.apache.org/viewvc?rev=892769&view=rev
Log:
Fix #46632. None of our pools require special handling when httpd is about to
exec a child (eg. CGI). No need to register the pool child cleanup. Still needs
an review
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=892769&r1=892768&r2=892769&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 11:24:21 2009
@@ -2732,7 +2732,7 @@
c->envvars_has_own = JK_FALSE;
c->s = s;
- apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup, jk_apr_pool_cleanup);
+ apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup,
apr_pool_cleanup_null);
return c;
}
@@ -2985,7 +2985,9 @@
/* hgo...@20070425 */
/* Shouldn't we clean both conf->log and main_log ?
*/
/* Also should we pass pointer (ie: main_log) or handle
(*main_log) ? */
- apr_pool_cleanup_register(p, &main_log, jklog_cleanup,
jklog_cleanup);
+ apr_pool_cleanup_register(p, &main_log,
+ jklog_cleanup,
+ apr_pool_cleanup_null);
}
return 0;
@@ -3061,7 +3063,7 @@
if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
- jk_cleanup_shmem);
+ apr_pool_cleanup_null);
}
else
jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
@@ -3162,8 +3164,9 @@
"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) {
- apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
- jk_cleanup_shmem);
+ apr_pool_cleanup_register(pconf, conf->log,
+ jk_cleanup_shmem,
+ apr_pool_cleanup_null);
}
else
jk_log(conf->log, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892769&r1=892768&r2=892769&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 11:24:21 2009
@@ -44,6 +44,10 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>46632</bug>: Httpd: Do not register child cleanup with
+ none of our pools. (mturk)
+ </fix>
+ <fix>
<bug>46893</bug>: Httpd: Log warning only if JkShmSize was actually
set in the configuration. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
