nacho 2002/06/10 14:55:08
Modified: jk/native2/common jk_channel.c jk_channel_apr_socket.c
jk_channel_jni.c jk_channel_socket.c
jk_channel_un.c jk_config.c jk_config_file.c
jk_endpoint.c jk_env.c jk_handler_logon.c
jk_handler_response.c jk_logger_win32.c jk_map.c
jk_msg_ajp.c jk_mutex.c jk_mutex_proc.c
jk_mutex_thread.c jk_nwmain.c jk_objCache.c
jk_pool.c jk_pool_apr.c jk_registry.c jk_requtil.c
jk_shm.c jk_uriEnv.c jk_uriMap.c jk_vm_default.c
jk_worker_ajp13.c jk_worker_jni.c jk_worker_lb.c
jk_worker_run.c jk_worker_status.c jk_workerEnv.c
jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c
jk/native2/server/apache13 mod_jk2.c
Log:
* Changed %p format specifiers to %#lx - Thanks to JFC ( where applicable )
* Changed copyright to be 1999-2002 :) in all files..
Revision Changes Path
1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Index: jk_channel.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_channel.c 30 May 2002 18:05:08 -0000 1.3
+++ jk_channel.c 10 Jun 2002 21:55:06 -0000 1.4
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.22 +1 -1
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_channel_apr_socket.c 30 May 2002 18:05:08 -0000 1.21
+++ jk_channel_apr_socket.c 10 Jun 2002 21:55:06 -0000 1.22
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.26 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_channel_jni.c 5 Jun 2002 19:26:45 -0000 1.25
+++ jk_channel_jni.c 10 Jun 2002 21:55:06 -0000 1.26
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -227,7 +227,7 @@
epData->jniJavaContext=(*jniEnv)->NewGlobalRef( jniEnv, jobj );
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channel_jni.open() Got ep %p %p\n", jobj, epData->jniJavaContext
);
+ "channel_jni.open() Got ep %#lx %#lx\n", jobj,
epData->jniJavaContext );
/* XXX Destroy them in close */
@@ -336,7 +336,7 @@
(jk_ch_jni_ep_private_t *)endpoint->channelData;
if( _this->mbean->debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() %p\n", epData );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() %#lx\n", epData
);
if( epData == NULL ) {
jk2_channel_jni_open( env, _this, endpoint );
@@ -357,7 +357,7 @@
b=msg->buf;
if( _this->mbean->debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() (1) %p\n",
epData );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() (1) %#lx\n",
epData );
jniEnv=NULL; /* epData->jniEnv; */
jbuf=epData->jarray;
@@ -409,7 +409,7 @@
#endif
if( _this->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channel_jni.send() before send %p\n",
+ "channel_jni.send() before send %#lx\n",
(void *)(long)epData->jniJavaContext);
sent=(*jniEnv)->CallStaticIntMethod( jniEnv,
1.32 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_channel_socket.c 31 May 2002 18:21:00 -0000 1.31
+++ jk_channel_socket.c 10 Jun 2002 21:55:06 -0000 1.32
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.12 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Index: jk_channel_un.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_channel_un.c 31 May 2002 18:21:00 -0000 1.11
+++ jk_channel_un.c 10 Jun 2002 21:55:06 -0000 1.12
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -414,7 +414,7 @@
blen=jk2_channel_un_readN( env, ch, endpoint, msg->buf, hlen );
if( blen <= 0 ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "channelUn.receive(): error receiving %d %d %s %p %d\n",
+ "channelUn.receive(): error receiving %d %d %s %#lx %d\n",
blen, errno, strerror( errno ), endpoint, endpoint->sd);
return JK_ERR;
}
1.26 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_config.c 31 May 2002 18:05:29 -0000 1.25
+++ jk_config.c 10 Jun 2002 21:55:06 -0000 1.26
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -199,7 +199,7 @@
}
if( cfg->mbean->debug > 0 )
- env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / %p / %s =
%s\n",
+ env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / %#lx / %s =
%s\n",
mbean->name, name, mbean, pname, val);
if( strcmp( name, "name" ) == 0 ) {
1.3 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_config_file.c 5 Jun 2002 21:56:39 -0000 1.2
+++ jk_config_file.c 10 Jun 2002 21:55:06 -0000 1.3
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.18 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Index: jk_endpoint.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_endpoint.c 29 May 2002 00:10:17 -0000 1.17
+++ jk_endpoint.c 10 Jun 2002 21:55:06 -0000 1.18
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -98,14 +98,14 @@
ep->workerEnv->epStat->structCnt=ep->mbean->id + 1;
if( ep->worker != NULL && ep->worker->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "SHM stats %d %p %p %s %s childId=%d\n", ep->mbean->id,
+ "SHM stats %d %#lx %#lx %s %s childId=%d\n",
ep->mbean->id,
ep->workerEnv->epStat->data, stats,
ep->mbean->localName, ep->mbean->name,
ep->workerEnv->childId);
} else {
stats = (jk_stat_t *)ep->mbean->pool->calloc( env, ep->mbean->pool, sizeof(
jk_stat_t ) );
if( ep->worker != NULL && ep->worker->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "Local stats %d %p %d\n", ep->mbean->id,
ep->workerEnv->epStat, ep->workerEnv->childId );
+ "Local stats %d %#lx %d\n", ep->mbean->id,
ep->workerEnv->epStat, ep->workerEnv->childId );
}
ep->stats=stats;
1.35 +10 -10 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_env.c 9 Jun 2002 18:52:06 -0000 1.34
+++ jk_env.c 10 Jun 2002 21:55:06 -0000 1.35
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -109,7 +109,7 @@
jk_env_globalEnv->globalPool = pool;
jk2_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
- /* fprintf( stderr, "env: top level env %p\n", jk_env_globalEnv); */
+ /* fprintf( stderr, "env: top level env %#lx\n", jk_env_globalEnv); */
}
return jk_env_globalEnv;
}
@@ -152,10 +152,10 @@
if( env->debug > 0 ) {
if( env->l == NULL )
- fprintf( stderr, "env:Create child env %p %p\n", parentEnv, env);
+ fprintf( stderr, "env:Create child env %#lx %#lx\n", parentEnv,
env);
else
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "env:Create child env %p %p\n", parentEnv, env);
+ "env:Create child env %#lx %#lx\n", parentEnv, env);
}
}
return env;
@@ -307,10 +307,10 @@
if( env->debug > 0 ) {
if( env->l == NULL )
- fprintf(stderr,"env.createBean2(): register %s %p\n", result->name,
result->object);
+ fprintf(stderr,"env.createBean2(): register %s %#lx\n", result->name,
result->object);
else
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "env.createBean2(): register %s %p\n", result->name,
result->object);
+ "env.createBean2(): register %s %#lx\n", result->name,
result->object);
}
jk_env_globalEnv->_objects->put( env, jk_env_globalEnv->_objects, result->name,
result, NULL );
@@ -368,20 +368,20 @@
if( result==NULL ) {
if( env->debug > 0 ) {
if( env->l == NULL )
- fprintf(stderr,"env.getByName(): Can't find %p %s\n", env, name);
+ fprintf(stderr,"env.getByName(): Can't find %#lx %s\n", env, name);
else
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "env.getByName(): Can't find %p %s\n", env, name);
+ "env.getByName(): Can't find %#lx %s\n", env, name);
}
return NULL;
}
if( env->debug > 0 ) {
if( env->l == NULL )
- fprintf(stderr,"env.getByName(): Get by name %s %p\n", name,
result->object);
+ fprintf(stderr,"env.getByName(): Get by name %s %#lx\n", name,
result->object);
else
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "env.getByName(): Get by name %s %p\n", name,
result->object);
+ "env.getByName(): Get by name %s %#lx\n", name,
result->object);
}
return result->object;
}
1.19 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_handler_logon.c 31 May 2002 18:21:00 -0000 1.18
+++ jk_handler_logon.c 10 Jun 2002 21:55:06 -0000 1.19
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.18 $
+ * Version: $Revision: 1.19 $
*/
#include "jk_global.h"
1.21 +1 -1
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_handler_response.c 28 May 2002 22:47:43 -0000 1.20
+++ jk_handler_response.c 10 Jun 2002 21:55:06 -0000 1.21
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.6 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_logger_win32.c 31 May 2002 18:21:00 -0000 1.5
+++ jk_logger_win32.c 10 Jun 2002 21:55:06 -0000 1.6
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.21 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_map.c
Index: jk_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_map.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_map.c 31 May 2002 18:05:29 -0000 1.20
+++ jk_map.c 10 Jun 2002 21:55:06 -0000 1.21
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose map object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***************************************************************************/
#include "jk_global.h"
1.17 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
Index: jk_msg_ajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_msg_ajp.c 28 May 2002 22:45:08 -0000 1.16
+++ jk_msg_ajp.c 10 Jun 2002 21:55:06 -0000 1.17
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.3 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c
Index: jk_mutex.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_mutex.c 31 May 2002 17:52:05 -0000 1.2
+++ jk_mutex.c 10 Jun 2002 21:55:06 -0000 1.3
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.3 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c
Index: jk_mutex_proc.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_mutex_proc.c 5 Jun 2002 21:56:39 -0000 1.2
+++ jk_mutex_proc.c 10 Jun 2002 21:55:06 -0000 1.3
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
Index: jk_mutex_thread.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_mutex_thread.c 5 Jun 2002 21:56:39 -0000 1.3
+++ jk_mutex_thread.c 10 Jun 2002 21:55:06 -0000 1.4
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.2 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_nwmain.c
Index: jk_nwmain.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_nwmain.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_nwmain.c 1 Dec 2001 22:38:39 -0000 1.1
+++ jk_nwmain.c 10 Jun 2002 21:55:06 -0000 1.2
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Netware Wrapper *
* Author: Mike Anderson <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#ifdef NETWARE
1.9 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
Index: jk_objCache.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_objCache.c 5 Jun 2002 21:56:39 -0000 1.8
+++ jk_objCache.c 10 Jun 2002 21:55:06 -0000 1.9
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.10 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_pool.c 25 Apr 2002 18:51:15 -0000 1.9
+++ jk_pool.c 10 Jun 2002 21:55:06 -0000 1.10
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Simple memory pool *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -274,13 +274,13 @@
static void jk2_dump_pool(jk_pool_t *p,
FILE *f)
{
- fprintf(f, "Dumping for pool [%p]\n", p);
+ fprintf(f, "Dumping for pool [%#lx]\n", p);
fprintf(f, "size [%d]\n", p->size);
fprintf(f, "pos [%d]\n", p->pos);
- fprintf(f, "buf [%p]\n", p->buf);
+ fprintf(f, "buf [%#lx]\n", p->buf);
fprintf(f, "dyn_size [%d]\n", p->dyn_size);
fprintf(f, "dyn_pos [%d]\n", p->dyn_pos);
- fprintf(f, "dynamic [%p]\n", p->dynamic);
+ fprintf(f, "dynamic [%#lx]\n", p->dynamic);
fflush(f);
}
1.6 +7 -7 jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c
Index: jk_pool_apr.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool_apr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_pool_apr.c 22 May 2002 23:42:32 -0000 1.5
+++ jk_pool_apr.c 10 Jun 2002 21:55:06 -0000 1.6
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -85,7 +85,7 @@
static void jk2_pool_apr_close(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_close %p\n", p);
+ fprintf(stderr, "apr_close %#lx\n", p);
#endif
}
@@ -96,7 +96,7 @@
static void jk2_pool_apr_reset(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_reset %p\n", p);
+ fprintf(stderr, "apr_reset %#lx\n", p);
#endif
apr_pool_clear(p->_private);
}
@@ -105,7 +105,7 @@
size_t size)
{
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_calloc %p %d\n", p, size);
+ fprintf(stderr, "apr_calloc %#lx %d\n", p, size);
#endif
/* assert( p->_private != NULL ) */
return apr_pcalloc( (apr_pool_t *)p->_private, (apr_size_t)size);
@@ -115,7 +115,7 @@
size_t size)
{
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_alloc %p %d\n", p, size);
+ fprintf(stderr, "apr_alloc %#lx %d\n", p, size);
#endif
return apr_palloc( (apr_pool_t *)p->_private, (apr_size_t)size);
@@ -129,7 +129,7 @@
void *rc;
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_realloc %p %d\n", p, sz);
+ fprintf(stderr, "apr_realloc %#lx %d\n", p, sz);
#endif
if(!p || (!old && old_sz)) {
return NULL;
@@ -147,7 +147,7 @@
const char *s)
{
#ifdef JK_APR_POOL_DEBUG
- fprintf(stderr, "apr_strdup %p %d\n", p, ((s==NULL)?-1: (int)strlen(s)));
+ fprintf(stderr, "apr_strdup %#lx %d\n", p, ((s==NULL)?-1: (int)strlen(s)));
#endif
return apr_pstrdup( (apr_pool_t *)p->_private, s);
}
1.27 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Index: jk_registry.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_registry.c 31 May 2002 17:52:05 -0000 1.26
+++ jk_registry.c 10 Jun 2002 21:55:06 -0000 1.27
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -67,7 +67,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.26 $ *
+ * Version: $Revision: 1.27 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
1.22 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c
Index: jk_requtil.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_requtil.c 31 May 2002 18:21:00 -0000 1.21
+++ jk_requtil.c 10 Jun 2002 21:55:06 -0000 1.22
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.26 +8 -8 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_shm.c 9 Jun 2002 01:55:28 -0000 1.25
+++ jk_shm.c 10 Jun 2002 21:55:06 -0000 1.26
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -129,12 +129,12 @@
if( shm->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "shm.create(): GLOBAL_SHM %p\n", shm->image );
+ "shm.create(): GLOBAL_SHM %#lx\n", shm->image );
return JK_OK;
} else {
if( shm->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "shm.create(): NO GLOBAL_SHM %p\n", shm->image );
+ "shm.create(): NO GLOBAL_SHM %#lx\n", shm->image );
}
@@ -197,7 +197,7 @@
apr_strerror( rc, error, 256 );
env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "shm.create(): error creating %s %d %d %p %s\n",
+ "shm.create(): error creating %s %d %d %#lx %s\n",
shm->fname, finfo.size, rc, globalShmPool, error );
shm->privateData=NULL;
return rc;
@@ -363,7 +363,7 @@
if( shm->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "shm.create(): shm created %p\n", shm->head );
+ "shm.create(): shm created %#lx\n", shm->head );
return JK_OK;
}
@@ -383,7 +383,7 @@
shm->head->lastSlot = 1;
if( shm->mbean->debug > 0 )
- env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.init() Reset %s %p\n",
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.init() Reset %s %#lx\n",
shm->fname, shm->image);
return JK_OK;
@@ -394,7 +394,7 @@
FILE *f;
int i;
- env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.dump(): Struct Size=%d slotSize=%d
slotCnt=%d head=%p\n",
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "shm.dump(): Struct Size=%d slotSize=%d
slotCnt=%d head=%#lx\n",
shm->size, shm->slotSize, shm->slotMaxCount, shm->head );
if( shm->head==NULL ) return JK_ERR;
@@ -462,7 +462,7 @@
if( slot==NULL ) return NULL;
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "shm.createSlot() Create %d %p %p\n", slotId, shm->image, slot );
+ "shm.createSlot() Create %d %#lx %#lx\n", slotId, shm->image,
slot );
strncpy(slot->name, name, 64 );
return slot;
1.23 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_uriEnv.c 23 May 2002 14:54:07 -0000 1.22
+++ jk_uriEnv.c 10 Jun 2002 21:55:06 -0000 1.23
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.34 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_uriMap.c 16 May 2002 21:03:44 -0000 1.33
+++ jk_uriMap.c 10 Jun 2002 21:55:06 -0000 1.34
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -425,7 +425,7 @@
if( uriMap->mbean->debug > 5 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "uriMap.init() loaded context %s %s %p %p %p\n",
+ "uriMap.init() loaded context %s %s %#lx %#lx %#lx\n",
uriEnv->virtual, context, hostEnv, hostEnv->webapps,
uriMap->pool);
uriEnv->match_type=MATCH_TYPE_CONTEXT;
1.17 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_vm_default.c 1 Jun 2002 15:40:09 -0000 1.16
+++ jk_vm_default.c 10 Jun 2002 21:55:06 -0000 1.17
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.31 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_worker_ajp13.c 10 Jun 2002 07:51:06 -0000 1.30
+++ jk_worker_ajp13.c 10 Jun 2002 21:55:06 -0000 1.31
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.18 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Index: jk_worker_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_worker_jni.c 10 Jun 2002 21:36:15 -0000 1.17
+++ jk_worker_jni.c 10 Jun 2002 21:55:06 -0000 1.18
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.19 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_worker_lb.c 31 May 2002 18:09:13 -0000 1.18
+++ jk_worker_lb.c 10 Jun 2002 21:55:06 -0000 1.19
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.8 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c
Index: jk_worker_run.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_run.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_worker_run.c 14 May 2002 17:27:21 -0000 1.7
+++ jk_worker_run.c 10 Jun 2002 21:55:06 -0000 1.8
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.29 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_worker_status.c 31 May 2002 22:27:16 -0000 1.28
+++ jk_worker_status.c 10 Jun 2002 21:55:06 -0000 1.29
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
1.53 +6 -6 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jk_workerEnv.c 9 Jun 2002 00:50:49 -0000 1.52
+++ jk_workerEnv.c 10 Jun 2002 21:55:06 -0000 1.53
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.52 $ *
+ * Version: $Revision: 1.53 $ *
***************************************************************************/
#include "jk_env.h"
@@ -655,7 +655,7 @@
wEnv=(jk_workerEnv_t *)pool->calloc( env, pool, sizeof( jk_workerEnv_t ));
- /* env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Creating workerEnv %p\n", wEnv); */
+ /* env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Creating workerEnv %#lx\n", wEnv);
*/
result->object=wEnv;
wEnv->mbean=result;
@@ -722,9 +722,9 @@
wEnv->envvars_in_use = JK_FALSE;
jk2_map_default_create(env, &wEnv->envvars, pool);
- jk2_map_default_create(env,&wEnv->worker_map, wEnv->pool);
- jk2_map_default_create(env,&wEnv->channel_map, wEnv->pool);
- jk2_map_default_create(env, & wEnv->endpointMap, wEnv->pool);
+ jk2_map_default_create(env, &wEnv->worker_map, wEnv->pool);
+ jk2_map_default_create(env, &wEnv->channel_map, wEnv->pool);
+ jk2_map_default_create(env, &wEnv->endpointMap, wEnv->pool);
wEnv->perThreadWorker=0;
1.26 +3 -3
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_service_apache2.c 5 Jun 2002 19:25:39 -0000 1.25
+++ jk_service_apache2.c 10 Jun 2002 21:55:08 -0000 1.26
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.25 $
+ * Version: $Revision: 1.26 $
*/
/*
@@ -127,7 +127,7 @@
/* XXX As soon as we switch to jk_map_apache2, this will not be needed ! */
if( debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "service.head() %d %d %p\n", s->status,
+ "service.head() %d %d %#lx\n", s->status,
numheaders, s->uriEnv);
for(h = 0 ; h < numheaders; h++) {
1.36 +8 -8 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_jk2.c 9 Jun 2002 01:56:14 -0000 1.35
+++ mod_jk2.c 10 Jun 2002 21:55:08 -0000 1.36
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.35 $ *
+ * Version: $Revision: 1.36 $ *
***************************************************************************/
/*
@@ -243,7 +243,7 @@
if( child->mbean->debug > -1 ) {
- fprintf(stderr, "mod_jk2:mergeDirConfig() Merged dir config %p %s %s %s
%s\n",
+ fprintf(stderr, "mod_jk2:mergeDirConfig() Merged dir config %#lx %s %s
%s %s\n",
child, child->uri, parent->uri, child->workerName,
parent->workerName);
}
}
@@ -400,7 +400,7 @@
for( i=0; i<10; i++ ) {
tmpPool=apr_pool_get_parent( gPool );
if( tmpPool == NULL ) {
- /* fprintf(stderr, "XXX Found Root pool %p\n", gPool ); */
+ /* fprintf(stderr, "XXX Found Root pool %#lx\n", gPool ); */
break;
}
gPool=tmpPool;
@@ -551,7 +551,7 @@
if( worker==NULL && uriEnv->workerName != NULL ) {
worker=env->getByName( env, uriEnv->workerName);
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() finding worker for %p %p %s\n",
+ "mod_jk.handler() finding worker for %#lx %#lx %s\n",
worker, uriEnv, uriEnv->workerName);
uriEnv->worker=worker;
}
@@ -566,7 +566,7 @@
if( uriEnv->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() serving %s with %p %p %s\n",
+ "mod_jk.handler() serving %s with %#lx %#lx %s\n",
uriEnv->mbean->localName, worker, worker->mbean,
worker->mbean->localName );
/* Get a pool for the request XXX move it in workerEnv to
@@ -576,7 +576,7 @@
rPool=worker->mbean->pool->create( env, worker->mbean->pool, HUGE_POOL_SIZE
);
if( uriEnv->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler(): new rpool %p\n", rPool );
+ "mod_jk.handler(): new rpool %#lx\n", rPool );
}
s=(jk_ws_service_t *)rPool->calloc( env, rPool, sizeof( jk_ws_service_t ));
@@ -678,7 +678,7 @@
if( uriEnv->mbean->debug > 0 )
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.translate(): uriMap %s %s %p\n",
+ "mod_jk.translate(): uriMap %s %s %#lx\n",
r->uri, uriEnv->workerName, uriEnv->worker);
workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
1.16 +5 -5 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_jk2.c 7 Jun 2002 23:45:30 -0000 1.15
+++ mod_jk2.c 10 Jun 2002 21:55:08 -0000 1.16
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
@@ -59,7 +59,7 @@
* Description: Apache 1.3 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***************************************************************************/
/*
@@ -349,13 +349,13 @@
} else {
worker=uriEnv->worker;
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() per dir worker for %p %p\n",
+ "mod_jk.handler() per dir worker for %#lx %#lx\n",
worker, uriEnv );
if( worker==NULL && uriEnv->workerName != NULL ) {
worker=env->getByName( env,uriEnv->workerName);
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "mod_jk.handler() finding worker for %s %p %p\n",
+ "mod_jk.handler() finding worker for %s %#lx %#lx\n",
uriEnv->workerName, worker, uriEnv );
uriEnv->worker=worker;
}
@@ -392,7 +392,7 @@
s->uriEnv = uriEnv;
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "modjk.handler() Calling %s %p\n", worker->mbean->name,
uriEnv);
+ "modjk.handler() Calling %s %#lx\n", worker->mbean->name,
uriEnv);
rc = worker->service(env, worker, s);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
