Author: hgomez
Date: Wed Apr 25 00:46:39 2007
New Revision: 532236
URL: http://svn.apache.org/viewvc?view=rev&rev=532236
Log:
Fix tab and comments about jk_cleanup (something seems bad)
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc?view=diff&rev=532236&r1=532235&r2=532236
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk.qclsrc Wed Apr 25
00:46:39 2007
@@ -1,9 +1,9 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
- SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
- 'USE_APACHE_MD5' '_REENTRANT') +
- TEXT('mod_jk.c') +
+ SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
+ DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ 'USE_APACHE_MD5' '_REENTRANT') +
+ TEXT('mod_jk.c') +
OPTIMIZE(40) +
LOCALETYPE(*LOCALE) +
SYSIFCOPT(*IFSIO) +
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc?view=diff&rev=532236&r1=532235&r2=532236
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/bldjk54.qclsrc Wed Apr 25
00:46:39 2007
@@ -1,9 +1,9 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
- SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
- '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
- TEXT('mod_jk.c') +
+ SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
+ TEXT('mod_jk.c') +
OPTIMIZE(40) +
LOCALETYPE(*LOCALEUTF) +
SYSIFCOPT(*IFSIO) +
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=532236&r1=532235&r2=532236
==============================================================================
--- 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 00:46:39
2007
@@ -314,7 +314,7 @@
}
}
- /* under i5/OS this flag is not set correctly */
+ /* under i5/OS this flag is not set correctly */
#ifdef AS400
r->sent_bodyct = 1;
#endif
@@ -2544,11 +2544,14 @@
static apr_status_t jklog_cleanup(void *d)
{
- /* set the main_log to NULL */
+ /* 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;
+ main_log = NULL;
#endif
+ /* [EMAIL PROTECTED] */
+ /* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */
d = NULL;
return APR_SUCCESS;
}
@@ -2623,7 +2626,11 @@
conf->log = jkl;
if (main_log == NULL) {
main_log = conf->log;
- apr_pool_cleanup_register(p, main_log, jklog_cleanup,
jklog_cleanup);
+
+ /* [EMAIL PROTECTED] */
+ /* 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);
}
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
