mturk 2002/07/01 08:46:20
Modified: jk/native2/server/apache2 mod_jk2.c
Log:
Register child_init pool cleanup function jk2_shutdown
Revision Changes Path
1.38 +13 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_jk2.c 19 Jun 2002 18:27:25 -0000 1.37
+++ mod_jk2.c 1 Jul 2002 15:46:20 -0000 1.38
@@ -370,6 +370,17 @@
return overrides;
}
+static apr_status_t jk2_shutdown(void *data)
+{
+ jk_env_t *env;
+ if (workerEnv) {
+ env=workerEnv->globalEnv;
+ workerEnv->close(env, workerEnv);
+ workerEnv = NULL;
+ }
+ return APR_SUCCESS;
+}
+
/** Initialize jk, using worker.properties.
We also use apache commands ( JkWorker, etc), but this use is
@@ -387,6 +398,7 @@
workerEnv->server_name = (char *)ap_get_server_version();
/* Should be done in post config instead (cf DAV2) */
/* ap_add_version_component(pconf, JK_EXPOSED_VERSION); */
+ apr_pool_cleanup_register(pconf, NULL, jk2_shutdown, apr_pool_cleanup_null);
return NULL;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
