You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2007/04/25 10:34:48 UTC
svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: hgomez
Date: Wed Apr 25 01:34:47 2007
New Revision: 532254
URL: http://svn.apache.org/viewvc?view=rev&rev=532254
Log:
Cleanup the pointer content (handle)
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=532254&r1=532253&r2=532254
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 25 01:34:47 2007
@@ -2544,15 +2544,11 @@
static apr_status_t jklog_cleanup(void *d)
{
- /* On i5/OS, Apache 2.x init stages and exec mode are done in the same thread */
- /* No fork as on Unixes, we need to cleanup some static variables */
-#ifdef AS400
- main_log = NULL;
-#endif
-
/* hgomez@20070425 */
- /* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */
- d = NULL;
+ /* Clean up pointer content */
+ if (d != NULL)
+ *(jk_logger_t **)d = NULL;
+
return APR_SUCCESS;
}
@@ -2630,7 +2626,7 @@
/* hgomez@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, jklog_cleanup);
}
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Posted by Henri Gomez <he...@gmail.com>.
It works :)
2007/4/25, Rainer Jung <ra...@kippdata.de>:
> My fault :(
No problem
> At least we found the problem, and it's fixed now.
:-)
> Concerning cleanup of conf->log: those are reset during the second
> initialization run. I see no reason, why we need to NULL them first.
>
> Did you check, that if you configure different logs inside your
> different virtual hosts, that the right logs get used? It works on non
> iSeries, I'm just curious, if this is still OK, after the patching.
It's still ok and works even with differents log and levels :)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Posted by Rainer Jung <ra...@kippdata.de>.
My fault :(
At least we found the problem, and it's fixed now.
Concerning cleanup of conf->log: those are reset during the second
initialization run. I see no reason, why we need to NULL them first.
Did you check, that if you configure different logs inside your
different virtual hosts, that the right logs get used? It works on non
iSeries, I'm just curious, if this is still OK, after the patching.
Regards,
Rainer
hgomez@apache.org schrieb:
> Author: hgomez
> Date: Wed Apr 25 01:34:47 2007
> New Revision: 532254
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=532254
> Log:
> Cleanup the pointer content (handle)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org