costin 01/12/16 15:29:55
Modified: jk/native2/common jk_map.c jk_md5.c jk_msg_ajp.c
jk_objCache.c jk_pool.c jk_requtil.c
jk_serialize_ajp.c jk_uriMap.c jk_workerEnv.c
Log:
Update to the new method signatures.
Revision Changes Path
1.9 +20 -18 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_map.c 2001/12/15 17:23:56 1.8
+++ jk_map.c 2001/12/16 23:29:55 1.9
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose map object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
#include "jk_global.h"
@@ -77,7 +77,7 @@
int size;
} jk_map_private_t;
-static int jk_map_default_realloc(jk_map_t *m);
+static int jk_map_default_realloc(jk_env_t *env, jk_map_t *m);
static void trim_prp_comment(char *prp);
static int trim(char *s);
@@ -127,7 +127,7 @@
return JK_TRUE;
}
- jk_map_default_realloc(m);
+ jk_map_default_realloc(env, m);
if(mPriv->size < mPriv->capacity) {
mPriv->values[mPriv->size] = value;
@@ -155,7 +155,7 @@
mPriv=(jk_map_private_t *)m->_private;
- jk_map_default_realloc(m);
+ jk_map_default_realloc(env, m);
if(mPriv->size < mPriv->capacity) {
mPriv->values[mPriv->size] = value;
@@ -346,7 +346,7 @@
if(listStr==NULL)
return NULL;
- v = pool->pstrdup( pool, listStr);
+ v = pool->pstrdup( env, pool, listStr);
if(v==NULL) {
return NULL;
@@ -359,7 +359,7 @@
for(l = strtok(v, " \t,*") ; l ; l = strtok(NULL, " \t,*")) {
if(idex == capacity) {
- ar = pool->realloc(pool,
+ ar = pool->realloc(env, pool,
sizeof(char *) * (capacity + 5),
ar,
sizeof(char *) * capacity);
@@ -368,7 +368,7 @@
}
capacity += 5;
}
- ar[idex] = pool->pstrdup(pool, l);
+ ar[idex] = pool->pstrdup(env, pool, l);
idex ++;
}
@@ -423,7 +423,7 @@
v = jk_map_replaceProperties(env, m, m->pool, v);
if(oldv) {
- char *tmpv = m->pool->alloc(m->pool,
+ char *tmpv = m->pool->alloc(env, m->pool,
strlen(v) + strlen(oldv) + 3);
char sep = '*';
@@ -432,16 +432,16 @@
break;
}
- if(jk_is_some_property(prp, "path")) {
+ if(jk_is_some_property(env, prp, "path")) {
sep = PATH_SEPERATOR;
- } else if(jk_is_some_property(prp, "cmd_line")) {
+ } else if(jk_is_some_property(env, prp, "cmd_line")) {
sep = ' ';
}
sprintf(tmpv, "%s%c%s", oldv, sep, v);
v = tmpv;
} else {
- v = m->pool->pstrdup(m->pool, v);
+ v = m->pool->pstrdup(env, m->pool, v);
}
if(v==NULL) {
@@ -489,7 +489,7 @@
if(env_value != NULL ) {
int offset=0;
- char *new_value = resultPool->alloc(resultPool,
+ char *new_value = resultPool->alloc(env, resultPool,
(strlen(rc) +
strlen(env_value)));
if(!new_value) {
break;
@@ -526,8 +526,8 @@
if( m== NULL )
return JK_FALSE;
- _this=(jk_map_t *)pool->alloc(pool, sizeof(jk_map_t));
- mPriv=(jk_map_private_t *)pool->alloc(pool, sizeof(jk_map_private_t));
+ _this=(jk_map_t *)pool->alloc(env, pool, sizeof(jk_map_t));
+ mPriv=(jk_map_private_t *)pool->alloc(env, pool, sizeof(jk_map_private_t));
*m=_this;
if( _this == NULL || mPriv==NULL )
@@ -569,7 +569,7 @@
/* XXX Very strange hack to deal with special properties
*/
-int jk_is_some_property(const char *prp_name, const char *suffix)
+int jk_is_some_property(jk_env_t *env, const char *prp_name, const char *suffix)
{
if (prp_name && suffix) {
size_t prp_name_len = strlen(prp_name);
@@ -614,7 +614,7 @@
return strlen(s);
}
-static int jk_map_default_realloc(jk_map_t *m)
+static int jk_map_default_realloc(jk_env_t *env, jk_map_t *m)
{
jk_map_private_t *mPriv=m->_private;
@@ -623,8 +623,10 @@
void **values;
int capacity = mPriv->capacity + CAPACITY_INC_SIZE;
- names = (char **)m->pool->alloc(m->pool, sizeof(char *) * capacity);
- values = (void **)m->pool->alloc(m->pool, sizeof(void *) * capacity);
+ names = (char **)m->pool->alloc(env, m->pool,
+ sizeof(char *) * capacity);
+ values = (void **)m->pool->alloc(env, m->pool,
+ sizeof(void *) * capacity);
if(values && names) {
if (mPriv->capacity && mPriv->names)
1.2 +3 -2 jakarta-tomcat-connectors/jk/native2/common/jk_md5.c
Index: jk_md5.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_md5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_md5.c 2001/12/01 22:38:39 1.1
+++ jk_md5.c 2001/12/16 23:29:55 1.2
@@ -103,7 +103,7 @@
/***************************************************************************
* Description: MD5 encoding wrapper *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
/*
@@ -457,7 +457,8 @@
}
}
-char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char
*dst)
+char * JK_METHOD jk_md5(jk_env_t *env,
+ const unsigned char *org, const unsigned char *org2, char
*dst)
{
JK_MD5_CTX ctx;
char buf[JK_MD5_DIGESTSIZE + 1];
1.3 +58 -60 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_msg_ajp.c 2001/12/12 23:36:01 1.2
+++ jk_msg_ajp.c 2001/12/16 23:29:55 1.3
@@ -60,7 +60,7 @@
* Author: Costin Manolache
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -77,11 +77,11 @@
/*
* Simple marshaling code.
*/
-static void jk_msg_ajp_dump(struct jk_msg *_this, struct jk_logger *log,
+static void jk_msg_ajp_dump(jk_env_t *env, struct jk_msg *_this,
char *err)
{
int i=0;
- log->jkLog( log, JK_LOG_INFO,
+ env->l->jkLog( env, env->l, JK_LOG_INFO,
"%s pos=%d len=%d max=%d "
"%x %x %x %x - %x %x %x %x -"
"%x %x %x %x - %x %x %x %x\n",
@@ -96,7 +96,7 @@
i=0;
}
- log->jkLog( log, JK_LOG_INFO,
+ env->l->jkLog( env, env->l, JK_LOG_INFO,
" %x %x %x %x - %x %x %x %x --- %x %x %x %x - %x %x %x %x\n",
_this->buf[i++],_this->buf[i++],_this->buf[i++],_this->buf[i++],
_this->buf[i++],_this->buf[i++],_this->buf[i++],_this->buf[i++],
@@ -105,13 +105,13 @@
}
-static void jk_msg_ajp_reset(jk_msg_t *_this)
+static void jk_msg_ajp_reset(jk_env_t *env, jk_msg_t *_this)
{
_this->len = 4;
_this->pos = 4;
}
-static void jk_msg_ajp_end(jk_msg_t *msg)
+static void jk_msg_ajp_end(jk_env_t *env, jk_msg_t *msg)
{
unsigned short len=msg->len - 4;
@@ -124,7 +124,7 @@
-static int jk_msg_ajp_appendLong(jk_msg_t *msg,
+static int jk_msg_ajp_appendLong(jk_env_t *env, jk_msg_t *msg,
unsigned long val)
{
int len=msg->len;
@@ -144,7 +144,7 @@
}
-static int jk_msg_ajp_appendInt(jk_msg_t *msg,
+static int jk_msg_ajp_appendInt(jk_env_t *env, jk_msg_t *msg,
unsigned short val)
{
int len=msg->len;
@@ -160,7 +160,7 @@
return 0;
}
-static int jk_msg_ajp_appendByte(jk_msg_t *msg,
+static int jk_msg_ajp_appendByte(jk_env_t *env, jk_msg_t *msg,
unsigned char val)
{
int len=msg->len;
@@ -174,13 +174,13 @@
return 0;
}
-static int jk_msg_ajp_appendString(jk_msg_t *msg,
+static int jk_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg,
const char *param)
{
int len;
if(!param) {
- msg->appendInt( msg, 0xFFFF );
+ msg->appendInt( env, msg, 0xFFFF );
return 0;
}
@@ -190,7 +190,7 @@
}
/* ignore error - we checked once */
- msg->appendInt(msg, (unsigned short )len);
+ msg->appendInt(env, msg, (unsigned short )len);
/* We checked for space !! */
strncpy((char *)msg->buf + msg->len , param, len+1); /* including \0 */
@@ -201,9 +201,9 @@
}
-static int jk_msg_ajp_appendBytes(jk_msg_t *msg,
+static int jk_msg_ajp_appendBytes(jk_env_t *env, jk_msg_t *msg,
const unsigned char *param,
- int len)
+ int len)
{
if (! len) {
return 0;
@@ -220,12 +220,12 @@
return 0;
}
-static unsigned long jk_msg_ajp_getLong(jk_msg_t *msg)
+static unsigned long jk_msg_ajp_getLong(jk_env_t *env, jk_msg_t *msg)
{
unsigned long i;
if(msg->pos + 3 > msg->len) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return -1;
}
@@ -236,11 +236,11 @@
return i;
}
-static unsigned short jk_msg_ajp_getInt(jk_msg_t *msg)
+static unsigned short jk_msg_ajp_getInt(jk_env_t *env, jk_msg_t *msg)
{
int i;
if(msg->pos + 1 > msg->len) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return -1;
}
@@ -249,11 +249,11 @@
return i;
}
-static unsigned short jk_msg_ajp_peekInt(jk_msg_t *msg)
+static unsigned short jk_msg_ajp_peekInt(jk_env_t *env, jk_msg_t *msg)
{
int i;
if(msg->pos + 1 > msg->len) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return -1;
}
@@ -262,11 +262,11 @@
return i;
}
-static unsigned char jk_msg_ajp_getByte(jk_msg_t *msg)
+static unsigned char jk_msg_ajp_getByte(jk_env_t *env, jk_msg_t *msg)
{
unsigned char rc;
if(msg->pos > msg->len) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return -1;
}
@@ -275,13 +275,13 @@
return rc;
}
-static unsigned char *jk_msg_ajp_getString(jk_msg_t *msg)
+static unsigned char *jk_msg_ajp_getString(jk_env_t *env, jk_msg_t *msg)
{
- int size = jk_msg_ajp_getInt(msg);
+ int size = jk_msg_ajp_getInt(env, msg);
int start = msg->pos;
if((size < 0 ) || (size + start > msg->maxlen)) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return (unsigned char *)"ERROR"; /* XXX */
}
@@ -292,15 +292,15 @@
return (unsigned char *)(msg->buf + start);
}
-static unsigned char *jk_msg_ajp_getBytes(jk_msg_t *msg, int *lenP)
+static unsigned char *jk_msg_ajp_getBytes(jk_env_t *env, jk_msg_t *msg, int *lenP)
{
- int size = jk_msg_ajp_getInt(msg);
+ int size = jk_msg_ajp_getInt(env, msg);
int start = msg->pos;
*lenP=size;
if((size < 0 ) || (size + start > msg->maxlen)) {
- msg->l->jkLog( msg->l, JK_LOG_ERROR,
+ env->l->jkLog( env, env->l, JK_LOG_ERROR,
"Error: try to get data past end of the buffer\n");
return (unsigned char *)"ERROR"; /* XXX */
}
@@ -325,17 +325,17 @@
/*
* Send a message to endpoint, using corresponding PROTO HEADER
*/
-static int jk_msg_ajp_send(jk_msg_t *msg,
- jk_endpoint_t *ae )
+static int jk_msg_ajp_send(jk_env_t *env, jk_msg_t *msg,
+ jk_endpoint_t *ae )
{
int err;
jk_channel_t *channel=ae->worker->channel;
- jk_msg_ajp_end(msg);
+ jk_msg_ajp_end(env, msg);
/* jk_msg_ajp_dump(l, JK_LOG_DEBUG, "sending to ajp13", msg); */
- err=channel->send( channel, ae,
+ err=channel->send( env, channel, ae,
msg->buf, msg->len );
if( err!=JK_TRUE ) {
@@ -349,28 +349,26 @@
/*
* Receive a message from endpoint
*/
-static int jk_msg_ajp_receive(jk_msg_t *msg,
+static int jk_msg_ajp_receive(jk_env_t *env, jk_msg_t *msg,
jk_endpoint_t *ae )
{
unsigned char head[4];
int rc;
int msglen;
jk_channel_t *channel=ae->worker->channel;
- jk_logger_t *l=msg->l;
-
- rc=channel->recv( channel, ae, head, 4 );
+ rc=channel->recv( env, channel, ae, head, 4 );
if(rc < 0) {
- l->jkLog(l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"msgAjp.receive(): Read head failed %d %d\n",
rc, errno);
return JK_FALSE;
}
if( head[0] != 0x41 || head[1] != 0x42 ) {
- l->jkLog(l, JK_LOG_ERROR,
- "msgAjp.receive(): Bad signature %x%x\n", head[0], head[1]);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "msgAjp.receive(): Bad signature %x%x\n", head[0], head[1]);
return JK_FALSE;
}
@@ -378,25 +376,27 @@
msglen += (head[3] & 0xFF);
if(msglen > msg->maxlen ) {
- l->jkLog(l, JK_LOG_ERROR,
- "msgAjp.receive(): Incoming message is too big %d\n", msglen);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "msgAjp.receive(): Incoming message is too big %d\n",
+ msglen);
return JK_FALSE;
}
msg->len=msglen;
msg->pos=0;
- rc=channel->recv( channel, ae, msg->buf, msglen);
+ rc=channel->recv( env, channel, ae, msg->buf, msglen);
if(rc < 0) {
- l->jkLog(l, JK_LOG_ERROR,
- "msgAjp.receive(): Error receiving message body %d %d\n",
- rc, errno);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "msgAjp.receive(): Error receiving message body %d %d\n",
+ rc, errno);
return JK_FALSE;
}
- l->jkLog(l, JK_LOG_INFO, "msgAjp.receive(): Received len=%d type=%d\n",
- msglen, (int)msg->buf[0]);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "msgAjp.receive(): Received len=%d type=%d\n",
+ msglen, (int)msg->buf[0]);
return JK_TRUE;
}
@@ -410,15 +410,14 @@
*
* Returns -1 on error, else number of bytes read
*/
-static int jk_msg_ajp_appendFromServer(jk_msg_t *msg,
+static int jk_msg_ajp_appendFromServer(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r,
jk_endpoint_t *ae,
int len )
{
unsigned char *read_buf = msg->buf;
- jk_logger_t *l=msg->l;
- jk_msg_ajp_reset(msg);
+ jk_msg_ajp_reset(env, msg);
read_buf += AJP_HEADER_LEN; /* leave some space for the buffer headers */
read_buf += AJP_HEADER_SZ_LEN; /* leave some space for the read length */
@@ -428,9 +427,9 @@
len = AJP13_MAX_SEND_BODY_SZ;
}
- if ((len = jk_requtil_readFully(r, read_buf, len)) < 0) {
- l->jkLog(l, JK_LOG_ERROR,
- "msgAjp.appendFromServer() error reading from server\n");
+ if ((len = jk_requtil_readFully(env, r, read_buf, len)) < 0) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "msgAjp.appendFromServer() error reading from server\n");
return -1;
}
@@ -441,9 +440,9 @@
if (len > 0) {
/* Recipient recognizes empty packet as end of stream, not
an empty body packet */
- if(0 != jk_msg_ajp_appendInt(msg, (unsigned short)len)) {
- l->jkLog(l, JK_LOG_ERROR,
- "read_into_msg_buff: Error - jk_b_append_int failed\n");
+ if(0 != jk_msg_ajp_appendInt(env, msg, (unsigned short)len)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "msg.appendFromServer(): appendInt failed\n");
return -1;
}
}
@@ -454,10 +453,10 @@
}
-jk_msg_t *jk_msg_ajp_create(jk_pool_t *pool, jk_logger_t *log, int buffSize)
+jk_msg_t *jk_msg_ajp_create(jk_env_t *env, jk_pool_t *pool, int buffSize)
{
jk_msg_t *msg =
- (jk_msg_t *)pool->calloc(pool, sizeof(jk_msg_t));
+ (jk_msg_t *)pool->calloc(env, pool, sizeof(jk_msg_t));
if( buffSize==0 )
buffSize=DEF_BUFFER_SZ;
@@ -466,13 +465,12 @@
}
msg->pool = pool;
- msg->buf= (unsigned char *)msg->pool->alloc(msg->pool, buffSize);
+ msg->buf= (unsigned char *)msg->pool->alloc(env, msg->pool, buffSize);
if(msg->buf==NULL) {
return NULL;
}
- msg->l=log;
msg->maxlen=buffSize;
msg->len=0;
1.3 +10 -9 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_objCache.c 2001/12/12 21:55:29 1.2
+++ jk_objCache.c 2001/12/16 23:29:55 1.3
@@ -65,7 +65,7 @@
#include "jk_objCache.h"
static int
-jk_objCache_put(jk_objCache_t *_this, void *obj)
+jk_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
{
int rc;
@@ -98,18 +98,20 @@
}
static int
-jk_objCache_init(jk_objCache_t *_this, int cacheSize ) {
+jk_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
int i;
_this->ep_cache =
- (void **)_this->pool->calloc(_this->pool, sizeof(void *) * cacheSize);
+ (void **)_this->pool->calloc(env, _this->pool,
+ sizeof(void *) * cacheSize);
if( _this->ep_cache==NULL )
return JK_FALSE;
JK_INIT_CS(&(_this->cs), i);
if (!i) {
- _this->l->jkLog(_this->l, JK_LOG_ERROR, "objCache.create(): Can't init
CS\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "objCache.create(): Can't init CS\n");
return JK_FALSE;
}
@@ -122,7 +124,7 @@
}
static int
-jk_objCache_destroy(jk_objCache_t *_this ) {
+jk_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
int i;
JK_DELETE_CS(&(_this->cs), i);
@@ -135,7 +137,7 @@
static void *
-jk_objCache_get(jk_objCache_t *_this )
+jk_objCache_get(jk_env_t *env, jk_objCache_t *_this )
{
int rc;
void *ae=NULL;
@@ -162,10 +164,9 @@
return NULL;
}
-jk_objCache_t *jk_objCache_create(jk_pool_t *pool, jk_logger_t *l ) {
- jk_objCache_t *_this=pool->calloc( pool, sizeof( jk_objCache_t ));
+jk_objCache_t *jk_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
+ jk_objCache_t *_this=pool->calloc( env, pool, sizeof( jk_objCache_t ));
- _this->l=l;
_this->pool=pool;
_this->get=jk_objCache_get;
1.5 +30 -26 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_pool.c 2001/12/06 22:59:03 1.4
+++ jk_pool.c 2001/12/16 23:29:55 1.5
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Simple memory pool *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -81,31 +81,35 @@
typedef struct jk_pool_private jk_pool_private_t;
-int jk_pool_create( jk_pool_t **newPool, jk_pool_t *parent, int size );
+int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
+ jk_pool_t *parent, int size );
int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
char *type, char *name);
-static jk_pool_t *jk_pool_createChild( jk_pool_t *parent, int size );
+static jk_pool_t *jk_pool_createChild( jk_env_t *env,
+ jk_pool_t *parent, int size );
-static void *jk_pool_dyn_alloc(jk_pool_t *p,
+static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p,
size_t size);
-static void jk_pool_reset(jk_pool_t *p);
+static void jk_pool_reset(jk_env_t *env, jk_pool_t *p);
-static void jk_pool_close(jk_pool_t *p);
+static void jk_pool_close(jk_env_t *env, jk_pool_t *p);
-static void *jk_pool_alloc(jk_pool_t *p, size_t size);
+static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_calloc(jk_pool_t *p, size_t size);
+static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_strdup(jk_pool_t *p, const char *s);
+static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
-static void *jk_pool_realloc(jk_pool_t *p, size_t sz,const void *old,
+static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void *old,
size_t old_sz);
-int jk_pool_create( jk_pool_t **newPool, jk_pool_t *parent, int size ) {
+int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
+ jk_pool_t *parent, int size )
+{
jk_pool_private_t *pp;
jk_pool_t *_this=(jk_pool_t *)malloc( sizeof( jk_pool_t ));
@@ -142,14 +146,14 @@
return JK_TRUE;
}
-static jk_pool_t *jk_pool_createChild( jk_pool_t *parent, int size ) {
+static jk_pool_t *jk_pool_createChild( jk_env_t *env, jk_pool_t *parent, int size )
{
jk_pool_t *newPool;
- jk_pool_create( &newPool, parent, size );
+ jk_pool_create( env, &newPool, parent, size );
return newPool;
}
-static void jk_pool_close(jk_pool_t *p)
+static void jk_pool_close(jk_env_t *env, jk_pool_t *p)
{
jk_pool_private_t *pp;
@@ -158,7 +162,7 @@
pp=(jk_pool_private_t *)p->_private;
- jk_pool_reset(p);
+ jk_pool_reset(env, p);
if(pp->dynamic) {
free(pp->dynamic);
}
@@ -168,7 +172,7 @@
free( p );
}
-static void jk_pool_reset(jk_pool_t *p)
+static void jk_pool_reset(jk_env_t *env, jk_pool_t *p)
{
jk_pool_private_t *pp;
@@ -190,17 +194,17 @@
pp->pos = 0;
}
-static void *jk_pool_calloc(jk_pool_t *p,
+static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
- void *rc=jk_pool_alloc( p, size );
+ void *rc=jk_pool_alloc( env, p, size );
if( rc==NULL )
return NULL;
memset( rc, 0, size );
return rc;
}
-static void *jk_pool_alloc(jk_pool_t *p,
+static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p,
size_t size)
{
void *rc = NULL;
@@ -224,21 +228,21 @@
#ifdef JK_DEBUG_POOL
printf("Dynamic alloc %d\n", pp->size );
#endif
- rc = jk_pool_dyn_alloc(p, size);
+ rc = jk_pool_dyn_alloc(env, p, size);
}
return rc;
}
-static void *jk_pool_realloc(jk_pool_t *p, size_t sz,const void *old,
- size_t old_sz)
+static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,
+ const void *old, size_t old_sz)
{
void *rc;
if(!p || (!old && old_sz)) {
return NULL;
}
- rc = jk_pool_alloc(p, sz);
+ rc = jk_pool_alloc(env, p, sz);
if(rc==NULL)
return NULL;
@@ -246,7 +250,7 @@
return rc;
}
-static void *jk_pool_strdup(jk_pool_t *p, const char *s)
+static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s)
{
char *rc = NULL;
if(s && p) {
@@ -256,7 +260,7 @@
return "";
}
- rc = jk_pool_alloc(p, size+1);
+ rc = jk_pool_alloc(env, p, size+1);
if(rc) {
memcpy(rc, s, size);
}
@@ -281,7 +285,7 @@
}
*/
-static void *jk_pool_dyn_alloc(jk_pool_t *p, size_t size)
+static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p, size_t size)
{
void *rc = NULL;
1.5 +18 -17 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_requtil.c 2001/12/15 17:24:16 1.4
+++ jk_requtil.c 2001/12/16 23:29:55 1.5
@@ -89,7 +89,7 @@
*
* long_res_header_for_sc
*/
-const char *jk_requtil_getHeaderById(int sc)
+const char *jk_requtil_getHeaderById(jk_env_t *env, int sc)
{
const char *rc = NULL;
if(sc <= SC_RES_HEADERS_NUM && sc > 0) {
@@ -104,7 +104,7 @@
*
* sc_for_req_method
*/
-int jk_requtil_getMethodId(const char *method,
+int jk_requtil_getMethodId(jk_env_t *env, const char *method,
unsigned char *sc)
{
int rc = JK_TRUE;
@@ -162,7 +162,7 @@
*
* sc_for_req_header
*/
-int jk_requtil_getHeaderId(const char *header_name,
+int jk_requtil_getHeaderId(jk_env_t *env, const char *header_name,
unsigned short *sc)
{
switch(header_name[0]) {
@@ -251,7 +251,7 @@
/** Retrieve the cookie with the given name
*/
-char *jk_requtil_getCookieByName(jk_ws_service_t *s,
+char *jk_requtil_getCookieByName(jk_env_t *env, jk_ws_service_t *s,
const char *name)
{
int i;
@@ -273,7 +273,7 @@
id_start += (1 + strlen(name));
if(strlen(id_start)) {
char *id_end;
- id_start = s->pool->pstrdup(s->pool, id_start);
+ id_start = s->pool->pstrdup(env, s->pool, id_start);
if(id_end = strchr(id_start, ';')) {
*id_end = '\0';
}
@@ -289,7 +289,8 @@
/* Retrieve the parameter with the given name
*/
-char *jk_requtil_getPathParam(jk_ws_service_t *s, const char *name)
+char *jk_requtil_getPathParam(jk_env_t *env, jk_ws_service_t *s,
+ const char *name)
{
char *id_start = NULL;
for(id_start = strstr(s->req_uri, name) ;
@@ -302,7 +303,7 @@
id_start += (1 + strlen(name));
if(strlen(id_start)) {
char *id_end;
- id_start = s->pool->pstrdup(s->pool, id_start);
+ id_start = s->pool->pstrdup(env, s->pool, id_start);
/*
* The query string is not part of req_uri, however
* to be on the safe side lets remove the trailing query
@@ -322,12 +323,12 @@
/** Retrieve session id from the cookie or the parameter
* (parameter first)
*/
-char *jk_requtil_getSessionId(jk_ws_service_t *s)
+char *jk_requtil_getSessionId(jk_env_t *env, jk_ws_service_t *s)
{
char *val;
- val = jk_requtil_getPathParam(s, JK_PATH_SESSION_IDENTIFIER);
+ val = jk_requtil_getPathParam(env, s, JK_PATH_SESSION_IDENTIFIER);
if(!val) {
- val = jk_requtil_getCookieByName(s, JK_SESSION_IDENTIFIER);
+ val = jk_requtil_getCookieByName(env, s, JK_SESSION_IDENTIFIER);
}
return val;
}
@@ -336,9 +337,9 @@
* the id of the worker that generated the session and where all
* further requests in that session will be sent.
*/
-char *jk_requtil_getSessionRoute(jk_ws_service_t *s)
+char *jk_requtil_getSessionRoute(jk_env_t *env, jk_ws_service_t *s)
{
- char *sessionid = jk_requtil_getSessionId(s);
+ char *sessionid = jk_requtil_getSessionId(env, s);
char *ch;
if(!sessionid) {
@@ -366,9 +367,9 @@
* Socket API didn't garanty all the data will be kept in a single
* read, so we must loop up to all awaited data are received
*/
-int jk_requtil_readFully(jk_ws_service_t *s,
- unsigned char *buf,
- unsigned len)
+int jk_requtil_readFully(jk_env_t *env, jk_ws_service_t *s,
+ unsigned char *buf,
+ unsigned len)
{
unsigned rdlen = 0;
unsigned padded_len = len;
@@ -388,7 +389,7 @@
while(rdlen < padded_len) {
unsigned this_time = 0;
- if(!s->read(s, buf + rdlen, len - rdlen, &this_time)) {
+ if(!s->read(env, s, buf + rdlen, len - rdlen, &this_time)) {
return -1;
}
@@ -408,7 +409,7 @@
*
* jk_init_ws_service
*/
-void jk_requtil_initRequest(jk_ws_service_t *s)
+void jk_requtil_initRequest(jk_env_t *env, jk_ws_service_t *s)
{
s->ws_private = NULL;
s->pool = NULL;
1.3 +89 -88 jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c
Index: jk_serialize_ajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_serialize_ajp.c 2001/12/15 17:24:16 1.2
+++ jk_serialize_ajp.c 2001/12/16 23:29:55 1.3
@@ -100,17 +100,16 @@
* XXX Add optional Key/Value set .
*
*/
-int jk_serialize_ping(jk_msg_t *msg,
- jk_endpoint_t *ae)
+int jk_serialize_ping(jk_env_t *env, jk_msg_t *msg,
+ jk_endpoint_t *ae)
{
- jk_logger_t *l=msg->l;
int rc;
/* To be on the safe side */
- msg->reset(msg);
+ msg->reset(env, msg);
/* SHUTDOWN CMD */
- rc= msg->appendByte( msg, JK_AJP13_PING);
+ rc= msg->appendByte( env, msg, JK_AJP13_PING);
if (rc!=JK_TRUE )
return JK_FALSE;
@@ -170,123 +169,125 @@
Was: ajp_marshal_into_msgb
*/
-int jk_serialize_request13(jk_msg_t *msg,
+int jk_serialize_request13(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s )
{
unsigned char method;
int i;
int headerCount;
- jk_logger_t *l=msg->l;
- l->jkLog(l, JK_LOG_DEBUG, "Into ajp_marshal_into_msgb\n");
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "Into ajp_marshal_into_msgb\n");
- if (!jk_requtil_getMethodId(s->method, &method)) {
- l->jkLog(l, JK_LOG_ERROR,
- "Error ajp_marshal_into_msgb - No such method %s\n", s->method);
+ if (!jk_requtil_getMethodId(env, s->method, &method)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "Error ajp_marshal_into_msgb - No such method %s\n",
+ s->method);
return JK_FALSE;
}
- headerCount=s->headers_in->size(NULL, s->headers_in);
+ headerCount=s->headers_in->size(env, s->headers_in);
- if (msg->appendByte(msg, JK_AJP13_FORWARD_REQUEST) ||
- msg->appendByte(msg, method) ||
- msg->appendString(msg, s->protocol) ||
- msg->appendString(msg, s->req_uri) ||
- msg->appendString(msg, s->remote_addr) ||
- msg->appendString(msg, s->remote_host) ||
- msg->appendString(msg, s->server_name) ||
- msg->appendInt(msg, (unsigned short)s->server_port) ||
- msg->appendByte(msg, (unsigned char)(s->is_ssl)) ||
- msg->appendInt(msg, (unsigned short)(headerCount))) {
+ if (msg->appendByte(env, msg, JK_AJP13_FORWARD_REQUEST) ||
+ msg->appendByte(env, msg, method) ||
+ msg->appendString(env, msg, s->protocol) ||
+ msg->appendString(env, msg, s->req_uri) ||
+ msg->appendString(env, msg, s->remote_addr) ||
+ msg->appendString(env, msg, s->remote_host) ||
+ msg->appendString(env, msg, s->server_name) ||
+ msg->appendInt(env, msg, (unsigned short)s->server_port) ||
+ msg->appendByte(env, msg, (unsigned char)(s->is_ssl)) ||
+ msg->appendInt(env, msg, (unsigned short)(headerCount))) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing the message head\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing the message head\n");
return JK_FALSE;
}
for (i = 0 ; i < headerCount ; i++) {
unsigned short sc;
- char *name=s->headers_in->nameAt(NULL, s->headers_in, i);
+ char *name=s->headers_in->nameAt(env, s->headers_in, i);
- if (jk_requtil_getHeaderId(name, &sc)) {
- if (msg->appendInt(msg, sc)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing header id\n");
+ if (jk_requtil_getHeaderId(env, name, &sc)) {
+ if (msg->appendInt(env, msg, sc)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing header id\n");
return JK_FALSE;
}
} else {
- if (msg->appendString(msg, name)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing header name\n");
+ if (msg->appendString(env, msg, name)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing header name\n");
return JK_FALSE;
}
}
- if (msg->appendString(msg, s->headers_in->valueAt( NULL, s->headers_in,
i))) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing header value\n");
+ if (msg->appendString(env, msg,
+ s->headers_in->valueAt( env, s->headers_in, i))) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing header value\n");
return JK_FALSE;
}
}
if (s->remote_user) {
- if (msg->appendByte(msg, SC_A_REMOTE_USER) ||
- msg->appendString(msg, s->remote_user)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing user name\n");
+ if (msg->appendByte(env, msg, SC_A_REMOTE_USER) ||
+ msg->appendString(env, msg, s->remote_user)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing user name\n");
return JK_FALSE;
}
}
if (s->auth_type) {
- if (msg->appendByte(msg, SC_A_AUTH_TYPE) ||
- msg->appendString(msg, s->auth_type)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing auth type\n");
+ if (msg->appendByte(env, msg, SC_A_AUTH_TYPE) ||
+ msg->appendString(env, msg, s->auth_type)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing auth type\n");
return JK_FALSE;
}
}
if (s->query_string) {
- if (msg->appendByte(msg, SC_A_QUERY_STRING) ||
- msg->appendString(msg, s->query_string)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing query string\n");
+ if (msg->appendByte(env, msg, SC_A_QUERY_STRING) ||
+ msg->appendString(env, msg, s->query_string)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing query string\n");
return JK_FALSE;
}
}
/* XXX This can be sent only on startup ( ajp14 ) */
if (s->jvm_route) {
- if (msg->appendByte(msg, SC_A_JVM_ROUTE) ||
- msg->appendString(msg, s->jvm_route)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing worker id\n");
+ if (msg->appendByte(env, msg, SC_A_JVM_ROUTE) ||
+ msg->appendString(env, msg, s->jvm_route)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing worker id\n");
return JK_FALSE;
}
}
if (s->ssl_cert_len) {
- if (msg->appendByte(msg, SC_A_SSL_CERT) ||
- msg->appendString(msg, s->ssl_cert)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing SSL cert\n");
+ if (msg->appendByte(env, msg, SC_A_SSL_CERT) ||
+ msg->appendString(env, msg, s->ssl_cert)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing SSL cert\n");
return JK_FALSE;
}
}
if (s->ssl_cipher) {
- if (msg->appendByte(msg, SC_A_SSL_CIPHER) ||
- msg->appendString(msg, s->ssl_cipher)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing SSL cipher\n");
+ if (msg->appendByte(env, msg, SC_A_SSL_CIPHER) ||
+ msg->appendString(env, msg, s->ssl_cipher)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing SSL cipher\n");
return JK_FALSE;
}
}
if (s->ssl_session) {
- if (msg->appendByte(msg, SC_A_SSL_SESSION) ||
- msg->appendString(msg, s->ssl_session)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing SSL session\n");
+ if (msg->appendByte(env, msg, SC_A_SSL_SESSION) ||
+ msg->appendString(env, msg, s->ssl_session)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing SSL session\n");
return JK_FALSE;
}
}
@@ -297,23 +298,23 @@
* JFC removed: ae->proto == AJP14_PROTO
*/
if (s->ssl_key_size != -1) {
- if (msg->appendByte(msg, SC_A_SSL_KEY_SIZE) ||
- msg->appendInt(msg, (unsigned short) s->ssl_key_size)) {
- l->jkLog(l, JK_LOG_ERROR,
- "handle.request() Error serializing SSL key size\n");
+ if (msg->appendByte(env, msg, SC_A_SSL_KEY_SIZE) ||
+ msg->appendInt(env, msg, (unsigned short) s->ssl_key_size)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "handle.request() Error serializing SSL key size\n");
return JK_FALSE;
}
}
- if (s->attributes->size( NULL, s->attributes) > 0) {
- for (i = 0 ; i < s->attributes->size( NULL, s->attributes) ; i++) {
- char *name=s->attributes->nameAt( NULL, s->attributes, i);
- char *val=s->attributes->nameAt( NULL, s->attributes, i);
- if (msg->appendByte(msg, SC_A_REQ_ATTRIBUTE) ||
- msg->appendString(msg, name ) ||
- msg->appendString(msg, val)) {
- l->jkLog(l, JK_LOG_ERROR,
+ if (s->attributes->size( env, s->attributes) > 0) {
+ for (i = 0 ; i < s->attributes->size( env, s->attributes) ; i++) {
+ char *name=s->attributes->nameAt( env, s->attributes, i);
+ char *val=s->attributes->nameAt( env, s->attributes, i);
+ if (msg->appendByte(env, msg, SC_A_REQ_ATTRIBUTE) ||
+ msg->appendString(env, msg, name ) ||
+ msg->appendString(env, msg, val)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handle.request() Error serializing attribute %s=%s\n",
name, val);
return JK_FALSE;
@@ -321,24 +322,24 @@
}
}
- if (msg->appendByte(msg, SC_A_ARE_DONE)) {
- l->jkLog(l, JK_LOG_ERROR,
+ if (msg->appendByte(env, msg, SC_A_ARE_DONE)) {
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handle.request() Error serializing end marker\n");
return JK_FALSE;
}
- l->jkLog(l, JK_LOG_INFO, "handle.request() request serialized\n");
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "handle.request() request serialized\n");
return JK_TRUE;
}
/** The inital BODY chunk
*/
-int jk_serialize_postHead(jk_msg_t *msg,
+int jk_serialize_postHead(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r,
jk_endpoint_t *e)
{
- jk_logger_t *l=msg->l;
int len = r->left_bytes_to_send;
if(len > AJP13_MAX_SEND_BODY_SZ) {
@@ -349,14 +350,14 @@
return JK_TRUE;
}
- len=msg->appendFromServer( msg, r, e, len );
+ len=msg->appendFromServer( env, msg, r, e, len );
/* the right place to add file storage for upload */
if (len >= 0) {
r->content_read += len;
return JK_TRUE;
}
- l->jkLog(l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handler.marshapPostHead() - error len=%d\n", len);
return JK_FALSE;
}
@@ -370,23 +371,23 @@
* +-----------------------+
*
*/
-int jk_serialize_shutdown(jk_msg_t *msg,
+int jk_serialize_shutdown(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r)
{
- jk_logger_t *l=msg->l;
int rc;
- l->jkLog(l, JK_LOG_DEBUG, "Into ajp14_marshal_shutdown_into_msgb\n");
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "Into ajp14_marshal_shutdown_into_msgb\n");
/* To be on the safe side */
- msg->reset(msg);
+ msg->reset(env, msg);
/* SHUTDOWN CMD */
- rc= msg->appendByte( msg, JK_AJP13_SHUTDOWN);
+ rc= msg->appendByte( env, msg, JK_AJP13_SHUTDOWN);
if (rc!=JK_TRUE )
return JK_FALSE;
- return JK_TRUE;
+ return JK_TRUE;
}
1.12 +83 -77 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_uriMap.c 2001/12/14 07:12:42 1.11
+++ jk_uriMap.c 2001/12/16 23:29:55 1.12
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <[EMAIL PROTECTED]>
- * Version: $Revision: 1.11 $
+ * Version: $Revision: 1.12 $
*/
#include "jk_pool.h"
@@ -77,22 +77,22 @@
int JK_METHOD jk_uriMap_factory( jk_env_t *env, jk_pool_t *pool, void **result,
const char *type, const char *name);
-static int jk_uriMap_init(jk_uriMap_t *_this,
+static int jk_uriMap_init( jk_env_t *env, jk_uriMap_t *_this,
jk_workerEnv_t *workerEnv,
jk_map_t *init_data );
-static jk_uriEnv_t *jk_uriMap_addMapping(jk_uriMap_t *_this,
+static jk_uriEnv_t *jk_uriMap_addMapping(jk_env_t *env, jk_uriMap_t *_this,
const char *vhost,
const char *puri,
const char *pworker );
-static INLINE const char *findExtension( const char *uri );
+static INLINE const char *findExtension( jk_env_t *env, const char *uri );
-static jk_uriEnv_t *jk_uriMap_mapUri(jk_uriMap_t *_this,
+static jk_uriEnv_t *jk_uriMap_mapUri( jk_env_t *env, jk_uriMap_t *_this,
const char *vhost,
const char *uri );
-static int jk_uriMap_checkUri(jk_uriMap_t *_this,
+static int jk_uriMap_checkUri( jk_env_t *env, jk_uriMap_t *_this,
const char *uri );
/*
@@ -106,7 +106,7 @@
*
* Was: check_security_fraud
*/
-static int jk_uriMap_checkUri(jk_uriMap_t *_this,
+static int jk_uriMap_checkUri( jk_env_t *env, jk_uriMap_t *_this,
const char *uri )
{
int i;
@@ -150,14 +150,15 @@
/*
* Ensure there will be memory in context info to store Context Bases
*/
-static int uriMap_realloc(jk_uriMap_t *_this)
+static int uriMap_realloc( jk_env_t *env,jk_uriMap_t *_this)
{
if (_this->size == _this->capacity) {
jk_uriEnv_t **uwr=NULL;
int capacity = _this->capacity + UW_INC_SIZE;
uwr = (jk_uriEnv_t **)
- _this->pool->alloc(_this->pool, sizeof(jk_uriEnv_t *) * capacity);
+ _this->pool->alloc(env, _this->pool,
+ sizeof(jk_uriEnv_t *) * capacity);
if (! uwr)
return JK_FALSE;
@@ -173,10 +174,10 @@
return JK_TRUE;
}
-static jk_uriEnv_t *jk_uriMap_createUriEnv(jk_uriMap_t *_this,
+static jk_uriEnv_t *jk_uriMap_createUriEnv( jk_env_t *env, jk_uriMap_t *_this,
const char *vhost, const char *uri )
{
- jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)_this->pool->calloc(_this->pool,
+ jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)_this->pool->calloc(env, _this->pool,
sizeof(jk_uriEnv_t));
uriEnv->workerEnv=_this->workerEnv;
/* XXX search the real webapp
@@ -186,12 +187,11 @@
return uriEnv;
}
-static jk_uriEnv_t *jk_uriMap_addMapping(jk_uriMap_t *_this,
+static jk_uriEnv_t *jk_uriMap_addMapping( jk_env_t *env, jk_uriMap_t *_this,
const char *vhost,
const char *puri,
const char *pworker )
{
- jk_logger_t *l=_this->workerEnv->l;
jk_uriEnv_t *uwr;
char *uri;
char *worker;
@@ -199,22 +199,24 @@
char *asterisk;
/* make sure we have space */
- err=uriMap_realloc(_this);
+ err=uriMap_realloc(env, _this);
if (err != JK_TRUE ) {
- l->jkLog(l, JK_LOG_ERROR,"uriMap.addMappint() OutOfMemoryException\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.addMappint() OutOfMemoryException\n");
return NULL;
}
- uwr = jk_uriMap_createUriEnv(_this,vhost,puri);
+ uwr = jk_uriMap_createUriEnv(env, _this,vhost,puri);
- uri = _this->pool->pstrdup(_this->pool, puri);
- uwr->uri = _this->pool->pstrdup(_this->pool, uri);
+ uri = _this->pool->pstrdup(env, _this->pool, puri);
+ uwr->uri = _this->pool->pstrdup(env, _this->pool, uri);
- worker = _this->pool->pstrdup(_this->pool, pworker);
+ worker = _this->pool->pstrdup(env, _this->pool, pworker);
uwr->webapp->workerName = worker;
if (uri==NULL || worker==NULL || uwr==NULL ) {
- l->jkLog(l, JK_LOG_ERROR,"uriMap.addMapping() NullPointerException\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.addMapping() NullPointerException\n");
return NULL;
}
@@ -225,9 +227,9 @@
* I have fixed jk_mount_context() in apaches/mod_jk.c so we should
* not arrive here when using Apache.
*/
- l->jkLog(l, JK_LOG_ERROR,
- "uriMap.addMapping() context must start with '/' in %s\n",
- uri);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.addMapping() context must start with '/' in %s\n",
+ uri);
return NULL;
}
@@ -244,9 +246,9 @@
uwr->suffix = NULL;
uwr->match_type = MATCH_TYPE_EXACT;
if( _this->debug > 0 ) {
- l->jkLog(l, JK_LOG_INFO,
- "uriMap.addMapping() exact mapping %s=%s was added\n",
- uri, worker);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.addMapping() exact mapping %s=%s was added\n",
+ uri, worker);
}
return uwr;
}
@@ -268,9 +270,9 @@
uwr->suffix = asterisk + 3;
uwr->match_type = MATCH_TYPE_SUFFIX;
if( _this->debug > 0 ) {
- l->jkLog(l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.addMapping() suffix mapping %s.%s=%s was added\n",
- uri, asterisk + 3, worker);
+ uri, asterisk + 3, worker);
}
} else if ('\0' != asterisk[2]) {
/* general suffix rule /foo/bar/STARextraData */
@@ -280,9 +282,9 @@
uwr->prefix_len =strlen( uwr->prefix );
uwr->match_type = MATCH_TYPE_GENERAL_SUFFIX;
if( _this->debug > 0 ) {
- l->jkLog(l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.addMapping() general suffix mapping %s.%s=%s\n",
- uri, asterisk + 2, worker);
+ uri, asterisk + 2, worker);
}
} else {
/* context based /foo/bar/STAR */
@@ -292,9 +294,9 @@
uwr->prefix_len =strlen( uwr->prefix );
uwr->match_type = MATCH_TYPE_CONTEXT;
if( _this->debug > 0 ) {
- l->jkLog(l, JK_LOG_INFO,
- "uriMap.addMapping() prefix mapping %s=%s\n",
- uri, worker);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.addMapping() prefix mapping %s=%s\n",
+ uri, worker);
}
}
} else {
@@ -305,16 +307,16 @@
uwr->suffix = NULL;
uwr->match_type = MATCH_TYPE_EXACT;
if( _this->debug > 0 ) {
- l->jkLog(l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.addMapping() prefix mapping2 %s=%s\n",
- uri, worker);
+ uri, worker);
}
}
return uwr;
}
-static int jk_uriMap_init(jk_uriMap_t *_this,
+static int jk_uriMap_init( jk_env_t *env, jk_uriMap_t *_this,
jk_workerEnv_t *workerEnv,
jk_map_t *init_data )
{
@@ -322,31 +324,32 @@
int sz;
int err;
int i;
- jk_logger_t *l=workerEnv->l;
_this->workerEnv = workerEnv;
- sz = init_data->size(NULL, init_data);
+ sz = init_data->size(env, init_data);
- _this->debug=jk_map_getIntProp(NULL,
+ _this->debug=jk_map_getIntProp(env,
init_data,"urimap", "default", "debug", 0 );
for(i = 0; i < sz ; i++) {
- char *name=init_data->nameAt(NULL, init_data, i);
+ char *name=init_data->nameAt(env, init_data, i);
if( name!=NULL && name[0]=='/' ) {
- jk_uriEnv_t *uriEnv=_this->addMapping(_this,NULL,name,
- init_data->valueAt(NULL, init_data, i));
+ jk_uriEnv_t *uriEnv=_this->addMapping(env, _this,NULL,name,
+ init_data->valueAt(env, init_data, i));
if ( uriEnv==NULL) {
- l->jkLog(l, JK_LOG_ERROR, "uriMap.init() error adding %s\n",
- init_data->nameAt(NULL, init_data, i));
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.init() error adding %s\n",
+ init_data->nameAt(env, init_data, i));
rc=JK_FALSE;
}
}
}
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.init(): rules=%d properties=\n",
- _this->size, sz );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.init(): rules=%d properties=\n",
+ _this->size, sz );
/* Set uriEnv->worker ( can't be done earlier since we might not have
the workers set up */
@@ -354,11 +357,11 @@
char *wname=_this->maps[i]->webapp->workerName;
/* assert( wname != NULL ); */
_this->maps[i]->webapp->worker=
- workerEnv->getWorkerForName( workerEnv, wname );
+ workerEnv->getWorkerForName( env, workerEnv, wname );
if( _this->maps[i]->webapp->worker==NULL ) {
- l->jkLog(l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"uriMap.init() map to invalid worker %s %s\n",
- _this->maps[i]->uri, wname);
+ _this->maps[i]->uri, wname);
}
}
@@ -366,16 +369,15 @@
return rc;
}
-static void jk_uriMap_destroy(jk_uriMap_t *_this)
+static void jk_uriMap_destroy( jk_env_t *env, jk_uriMap_t *_this)
{
- jk_logger_t *l=_this->workerEnv->l;
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.destroy()\n");
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "uriMap.destroy()\n");
/* this can't be null ( or a NPE would have been generated */
- _this->pool->close(_this->pool);
+ _this->pool->close(env, _this->pool);
}
@@ -395,7 +397,7 @@
we check only the last component, as required by
servlet spec
*/
-static INLINE const char *findExtension( const char *uri ) {
+static INLINE const char *findExtension( jk_env_t *env, const char *uri ) {
int suffix_start;
const char *suffix;
@@ -418,7 +420,7 @@
#define SAFE_URI_SIZE 8192
-static jk_uriEnv_t *jk_uriMap_mapUri(jk_uriMap_t *_this,
+static jk_uriEnv_t *jk_uriMap_mapUri( jk_env_t *env, jk_uriMap_t *_this,
const char *vhost,
const char *uri )
{
@@ -429,7 +431,6 @@
char *url_rewrite=NULL;
const char *suffix;
int uriLen;
- jk_logger_t *l=_this->workerEnv->l;
/* Ugly hack to avoid using non-thread safe code.
Modify the uri in place for uri session encoding, then
@@ -449,10 +450,12 @@
return NULL;
if( _this->debug > 1 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.mapUri() %s %s\n", vhost, uri);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() %s %s\n", vhost, uri);
if( '/' != uri[0]) {
- l->jkLog(l, JK_LOG_ERROR, "uriMap.mapUri() uri must start with /\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.mapUri() uri must start with /\n");
return NULL;
}
@@ -462,13 +465,14 @@
origChar=*url_rewrite;
*url_rewrite = '\0';
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.mapUri() rewrote uri %s \n",uri );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() rewrote uri %s \n",uri );
}
uriLen=strlen( uri );
/* Only once, no need to compute it for each extension match */
- suffix=findExtension( uri );
+ suffix=findExtension( env, uri );
for(i = 0 ; i < _this->size ; i++) {
jk_uriEnv_t *uwr = _this->maps[i];
@@ -487,9 +491,9 @@
if(MATCH_TYPE_EXACT == uwr->match_type &&
uriLen == uwr->prefix_len) {
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO,
- "uriMap.mapUri() exact match %s:%s \n",
- uwr->webapp->worker->name, uwr->prefix );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() exact match %s:%s \n",
+ uwr->webapp->worker->name, uwr->prefix );
/* restore */
if( url_rewrite ) *url_rewrite=origChar;
return uwr;
@@ -497,9 +501,9 @@
if(uwr->prefix_len > longest_match) {
/* This takes care of 'shorter' matches */
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"uriMap.mapUri() tentative prefix match %s",
- uwr->prefix );
+ uwr->prefix );
longest_match = uwr->prefix_len;
best_match = i;
}
@@ -508,9 +512,9 @@
int suffix_start=last_index_of(uri,uwr->suffix[0]);
if (suffix_start>=0 && 0==strcmp(uri+suffix_start,uwr->suffix)) {
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO,
- "uriMap.mapUri() general suffix match %s\n",
- uwr->suffix );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() general suffix match %s\n",
+ uwr->suffix );
longest_match = uwr->prefix_len;
best_match = i;
}
@@ -525,9 +529,9 @@
#endif
if(uwr->prefix_len >= longest_match) {
if( _this->debug > 0 )
- l->jkLog(l,JK_LOG_INFO,
- "uriMap.mapUri() suffix match %s\n",
- uwr->suffix );
+ env->l->jkLog(env, env->l,JK_LOG_INFO,
+ "uriMap.mapUri() suffix match %s\n",
+ uwr->suffix );
longest_match = uwr->prefix_len;
best_match = i;
}
@@ -547,13 +551,15 @@
if(-1 != best_match) {
if( _this->debug > 0 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.mapUri() matched %s %s\n",
- uri, _this->maps[best_match]->webapp->worker->name );
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() matched %s %s\n",
+ uri, _this->maps[best_match]->webapp->worker->name );
return _this->maps[best_match];
}
if( _this->debug > 1 )
- l->jkLog(l, JK_LOG_INFO, "uriMap.mapUri() no match found\n");
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "uriMap.mapUri() no match found\n");
return NULL;
}
@@ -563,11 +569,11 @@
{
jk_uriMap_t *_this;
jk_map_t *init_data;
- jk_logger_t *l=env->logger;
- _this = (jk_uriMap_t *)pool->calloc(pool, sizeof(jk_uriMap_t));
+ _this = (jk_uriMap_t *)pool->calloc(env, pool, sizeof(jk_uriMap_t));
if( ! _this) {
- l->jkLog(l, JK_LOG_ERROR, "uriMap.factory() OutOfMemoryError\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "uriMap.factory() OutOfMemoryError\n");
return JK_FALSE;
}
1.10 +103 -109 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_workerEnv.c 2001/12/14 07:12:42 1.9
+++ jk_workerEnv.c 2001/12/16 23:29:55 1.10
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
#include "jk_workerEnv.h"
@@ -71,28 +71,27 @@
int JK_METHOD jk_workerEnv_factory( jk_env_t *env, jk_pool_t *pool, void **result,
const char *type, const char *name);
-static void jk_workerEnv_close(jk_workerEnv_t *_this);
-static void jk_workerEnv_initHandlers(jk_workerEnv_t *_this);
+static void jk_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this);
+static void jk_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this);
/**
* Init the workers, prepare the we.
*
* Replaces wc_open
*/
-static int jk_workerEnv_init(jk_workerEnv_t *_this)
+static int jk_workerEnv_init(jk_env_t *env, jk_workerEnv_t *_this)
{
jk_map_t *init_data=_this->init_data;
char **worker_list = NULL;
- jk_logger_t *l=_this->l;
int i;
int err;
char *tmp;
/* _this->init_data=init_data; */
- tmp = jk_map_getString(NULL, init_data, "worker.list",
+ tmp = jk_map_getString(env, init_data, "worker.list",
DEFAULT_WORKER );
- worker_list=jk_map_split( NULL, init_data, init_data->pool,
+ worker_list=jk_map_split( env, init_data, init_data->pool,
tmp, &_this->num_of_workers );
if(worker_list==NULL || _this->num_of_workers<= 0 ) {
@@ -105,11 +104,11 @@
jk_worker_t *oldw = NULL;
const char *name=(const char*)worker_list[i];
- w=_this->createWorker(_this, name, init_data);
+ w=_this->createWorker(env, _this, name, init_data);
if( w==NULL ) {
- l->jkLog(_this->l, JK_LOG_ERROR,
- "init failed to create worker %s\n",
- worker_list[i]);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "init failed to create worker %s\n",
+ worker_list[i]);
/* Ignore it, other workers may be ok.
return JK_FALSE; */
} else {
@@ -118,49 +117,49 @@
}
}
- jk_workerEnv_initHandlers( _this );
+ jk_workerEnv_initHandlers( env, _this );
- l->jkLog(_this->l, JK_LOG_INFO,
- "workerEnv.init() %d workers, default %s\n",
- _this->num_of_workers, worker_list[0]);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "workerEnv.init() %d workers, default %s\n",
+ _this->num_of_workers, worker_list[0]);
return JK_TRUE;
}
-static void jk_workerEnv_close(jk_workerEnv_t *_this)
+static void jk_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this)
{
- jk_logger_t *l=_this->l;
int sz;
int i;
- sz = _this->worker_map->size(NULL, _this->worker_map);
+ sz = _this->worker_map->size(env, _this->worker_map);
for(i = 0 ; i < sz ; i++) {
- jk_worker_t *w = _this->worker_map->valueAt(NULL, _this->worker_map, i);
+ jk_worker_t *w = _this->worker_map->valueAt(env, _this->worker_map, i);
if(w) {
- l->jkLog(l, JK_LOG_DEBUG,
- "destroy worker %s\n",
- _this->worker_map->nameAt(NULL, _this->worker_map, i));
- w->destroy(&w, l);
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "destroy worker %s\n",
+ _this->worker_map->nameAt(env, _this->worker_map, i));
+ w->destroy(env,w);
}
}
- l->jkLog(_this->l, JK_LOG_DEBUG, "workerEnv.close() done %d\n", sz);
- _this->worker_map->clear(NULL, _this->worker_map);
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "workerEnv.close() done %d\n", sz);
+ _this->worker_map->clear(env, _this->worker_map);
}
-static jk_worker_t *jk_workerEnv_getWorkerForName(jk_workerEnv_t *_this,
+static jk_worker_t *jk_workerEnv_getWorkerForName(jk_env_t *env,
+ jk_workerEnv_t *_this,
const char *name )
{
jk_worker_t * rc;
- jk_logger_t *l=_this->l;
if(!name) {
- l->jkLog(l, JK_LOG_ERROR,
- "workerEnv.getWorkerForName() NullPointerException\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "workerEnv.getWorkerForName() NullPointerException\n");
return NULL;
}
- rc = _this->worker_map->get(NULL, _this->worker_map, name);
+ rc = _this->worker_map->get(env, _this->worker_map, name);
/* if( rc==NULL ) { */
/* l->jkLog(l, JK_LOG_INFO, */
@@ -170,7 +169,8 @@
}
-static jk_webapp_t *jk_workerEnv_createWebapp(jk_workerEnv_t *_this,
+static jk_webapp_t *jk_workerEnv_createWebapp(jk_env_t *env,
+ jk_workerEnv_t *_this,
const char *vhost,
const char *name,
jk_map_t *init_data)
@@ -178,16 +178,16 @@
jk_pool_t *webappPool;
jk_webapp_t *webapp;
- webappPool=(jk_pool_t *)_this->pool->create( _this->pool,
+ webappPool=(jk_pool_t *)_this->pool->create( env, _this->pool,
HUGE_POOL_SIZE);
- webapp=(jk_webapp_t *)webappPool->calloc(webappPool,
+ webapp=(jk_webapp_t *)webappPool->calloc(env, webappPool,
sizeof( jk_webapp_t ));
webapp->pool=webappPool;
- webapp->context=_this->pool->pstrdup( _this->pool, name);
- webapp->virtual=_this->pool->pstrdup( _this->pool, vhost);
+ webapp->context=_this->pool->pstrdup( env, _this->pool, name);
+ webapp->virtual=_this->pool->pstrdup( env, _this->pool, vhost);
if( name==NULL ) {
webapp->ctxt_len=0;
@@ -204,7 +204,7 @@
}
-static void jk_workerEnv_checkSpace( jk_pool_t *pool,
+static void jk_workerEnv_checkSpace( jk_env_t *env, jk_pool_t *pool,
void ***tableP, int *sizeP, int id )
{
void **newTable;
@@ -213,7 +213,7 @@
if( *sizeP > id ) return;
/* resize the table */
- newTable=(void **)pool->calloc( pool, newSize * sizeof( void *));
+ newTable=(void **)pool->calloc( env, pool, newSize * sizeof( void *));
for( i=0; i<*sizeP; i++ ) {
newTable[i]= (*tableP)[i];
}
@@ -221,12 +221,12 @@
*sizeP=newSize;
}
-static void jk_workerEnv_initHandlers(jk_workerEnv_t *_this)
+static void jk_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this)
{
/* Find the max message id */
/* XXX accessing private data... env most provide some method to get this */
- jk_map_t *registry=_this->env->_registry;
- int size=registry->size( NULL, registry );
+ jk_map_t *registry=env->_registry;
+ int size=registry->size( env, registry );
int i,j;
for( i=0; i<size; i++ ) {
@@ -234,18 +234,16 @@
jk_map_t *localHandlers;
int rc;
- char *name= registry->nameAt( NULL, registry, i );
+ char *name= registry->nameAt( env, registry, i );
if( strstr( name, "handler" ) == name ) {
char *type=name+ strlen( "handler" ) +1;
- localHandlers=(jk_map_t *)_this->env->getInstance(_this->env,
- _this->pool,
- "handler",
- type );
+ localHandlers=(jk_map_t *)env->getInstance(env, _this->pool,
+ "handler", type );
if( localHandlers==NULL ) continue;
- for( j=0; j< localHandlers->size( NULL, localHandlers ); j++ ) {
- handler=(jk_handler_t *)localHandlers->valueAt( NULL,
localHandlers, j );
- jk_workerEnv_checkSpace( _this->pool,
+ for( j=0; j< localHandlers->size( env, localHandlers ); j++ ) {
+ handler=(jk_handler_t *)localHandlers->valueAt( env, localHandlers,
j );
+ jk_workerEnv_checkSpace( env, _this->pool,
(void ***)&_this->handlerTable,
&_this->lastMessageId,
handler->messageId );
@@ -272,9 +270,8 @@
* In fact if tomcat link is broken during upload (browser ->apache ->tomcat)
* we'll loose data and we'll have to abort the whole request.
*/
-static int jk_workerEnv_processCallbacks(jk_workerEnv_t *_this,
- jk_endpoint_t *e,
- jk_ws_service_t *r )
+static int jk_workerEnv_processCallbacks(jk_env_t *env, jk_workerEnv_t *_this,
+ jk_endpoint_t *e, jk_ws_service_t *r )
{
int code;
jk_handler_t *handler;
@@ -288,36 +285,36 @@
rc=-1;
handler=NULL;
- _this->l->jkLog(_this->l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.processCallbacks() Waiting reply\n");
- e->reply->reset(e->reply);
+ e->reply->reset(env, e->reply);
- rc= e->reply->receive( e->reply, e );
+ rc= e->reply->receive( env, e->reply, e );
if( rc!=JK_TRUE ) {
- _this->l->jkLog(_this->l, JK_LOG_ERROR,
- "ajp14.service() Error reading reply\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "ajp14.service() Error reading reply\n");
/* we just can't recover, unset recover flag */
return JK_FALSE;
}
- code = (int)e->reply->getByte(e->reply);
+ code = (int)e->reply->getByte(env, e->reply);
if( code < maxHandler ) {
handler=handlerTable[ code ];
}
if( handler==NULL ) {
- _this->l->jkLog(_this->l, JK_LOG_ERROR,
- "ajp14.processCallback() Invalid code: %d\n", code);
- e->reply->dump(e->reply, _this->l, "Message: ");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "ajp14.processCallback() Invalid code: %d\n", code);
+ e->reply->dump(env, e->reply, "Message: ");
return JK_FALSE;
}
- _this->l->jkLog(_this->l, JK_LOG_DEBUG,
- "ajp14.dispath() Calling %d %s\n", handler->messageId,
- handler->name);
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG,
+ "ajp14.dispath() Calling %d %s\n", handler->messageId,
+ handler->name);
/* Call the message handler */
- rc=handler->callback( e->reply, r, e, _this->l );
+ rc=handler->callback( env, e->reply, r, e );
/* Process the status code returned by handler */
switch( rc ) {
@@ -338,9 +335,9 @@
* data to file and replay for it
*/
e->recoverable = JK_FALSE;
- rc = e->post->send(e->post, e );
+ rc = e->post->send(env, e->post, e );
if (rc < 0) {
- _this->l->jkLog(_this->l, JK_LOG_ERROR,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.processCallbacks() error sending response data\n");
return JK_FALSE;
}
@@ -372,40 +369,41 @@
-static jk_worker_t *jk_workerEnv_createWorker(jk_workerEnv_t *_this,
+static jk_worker_t *jk_workerEnv_createWorker(jk_env_t *env,
+ jk_workerEnv_t *_this,
const char *name,
jk_map_t *init_data)
{
int err;
char *type;
jk_env_objectFactory_t fac;
- jk_logger_t *l=_this->l;
jk_worker_t *w = NULL;
jk_worker_t *oldW = NULL;
jk_pool_t *workerPool;
/* First find if it already exists */
- w=_this->getWorkerForName( _this, name );
+ w=_this->getWorkerForName( env, _this, name );
if( w != NULL ) {
- l->jkLog(l, JK_LOG_INFO,
- "workerEnv.createWorker(): Using existing worker %s\n",name);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "workerEnv.createWorker(): Using existing worker %s\n",
+ name);
return w;
}
- workerPool=_this->pool->create(_this->pool, HUGE_POOL_SIZE);
+ workerPool=_this->pool->create(env, _this->pool, HUGE_POOL_SIZE);
- type=jk_map_getStrProp( NULL, init_data,"worker",name,"type",NULL );
+ type=jk_map_getStrProp( env, init_data,"worker",name,"type",NULL );
/* Each worker has it's own pool */
- w=(jk_worker_t *)_this->env->getInstance(_this->env, workerPool, "worker",
- type );
+ w=(jk_worker_t *)env->getInstance(env, workerPool, "worker",
+ type );
if( w == NULL ) {
- l->jkLog(l, JK_LOG_ERROR,
- "workerEnv.createWorker(): factory can't create worker %s:%s\n",
- type, name);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "workerEnv.createWorker(): factory can't create worker %s:%s\n",
+ type, name);
return NULL;
}
@@ -413,34 +411,37 @@
w->pool=workerPool;
w->workerEnv=_this;
- err=w->validate(w, init_data, _this, l);
+ err=w->validate(env, w, init_data, _this);
if( err!=JK_TRUE ) {
- l->jkLog(l, JK_LOG_ERROR,
- "workerEnv.createWorker(): validate failed for %s:%s\n",
- type, name);
- w->destroy(&w, l);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "workerEnv.createWorker(): validate failed for %s:%s\n",
+ type, name);
+ w->destroy(env, w);
return NULL;
}
- err=w->init(w, init_data, _this, l);
+ err=w->init(env, w, init_data, _this);
if(err!=JK_TRUE) {
- w->destroy(&w, l);
- l->jkLog(l, JK_LOG_ERROR, "workerEnv.createWorker() init failed for %s\n",
- name);
+ w->destroy(env, w);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "workerEnv.createWorker() init failed for %s\n",
+ name);
return NULL;
}
- l->jkLog(l, JK_LOG_INFO,
- "workerEnv.createWorker(): validate and init %s:%s\n", type, name);
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "workerEnv.createWorker(): validate and init %s:%s\n",
+ type, name);
- _this->worker_map->put(NULL, _this->worker_map, name, w, (void *)&oldW);
+ _this->worker_map->put(env, _this->worker_map, name, w, (void *)&oldW);
if(oldW!=NULL) {
- l->jkLog(_this->l, JK_LOG_ERROR, "workerEnv.createWorker() duplicated %s
worker \n",
- name);
- oldW->destroy(&oldW, _this->l);
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "workerEnv.createWorker() duplicated %s worker \n",
+ name);
+ oldW->destroy(env, oldW);
}
return w;
@@ -449,14 +450,13 @@
int JK_METHOD jk_workerEnv_factory( jk_env_t *env, jk_pool_t *pool, void **result,
const char *type, const char *name)
{
- jk_logger_t *l=env->logger;
jk_workerEnv_t *_this;
int err;
jk_pool_t *uriMapPool;
- l->jkLog(l, JK_LOG_DEBUG, "Creating workerEnv \n");
+ env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Creating workerEnv \n");
- _this=(jk_workerEnv_t *)pool->calloc( pool, sizeof( jk_workerEnv_t ));
+ _this=(jk_workerEnv_t *)pool->calloc( env, pool, sizeof( jk_workerEnv_t ));
_this->pool=pool;
*result=_this;
@@ -467,7 +467,6 @@
_this->worker_file = NULL;
_this->log_file = NULL;
_this->log_level = -1;
- _this->l = NULL;
_this->mountcopy = JK_FALSE;
_this->was_initialized = JK_FALSE;
_this->options = JK_OPT_FWDURIDEFAULT;
@@ -509,22 +508,17 @@
_this->secret_key = NULL;
_this->envvars_in_use = JK_FALSE;
- jk_map_default_create(NULL, &_this->envvars, pool);
+ jk_map_default_create(env, &_this->envvars, pool);
- _this->l=l;
- _this->env=env;
-
- jk_map_default_create(NULL,&_this->worker_map, _this->pool);
+ jk_map_default_create(env,&_this->worker_map, _this->pool);
- uriMapPool = _this->pool->create(_this->pool, HUGE_POOL_SIZE);
+ uriMapPool = _this->pool->create(env, _this->pool, HUGE_POOL_SIZE);
- _this->uriMap=_this->env->getInstance( _this->env,
- uriMapPool,
- "uriMap",
- "default");
+ _this->uriMap=env->getInstance(env, uriMapPool,"uriMap", "default");
if( _this->uriMap==NULL ) {
- l->jkLog(l, JK_LOG_ERROR, "Error getting uriMap implementation\n");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "Error getting uriMap implementation\n");
return JK_FALSE;
}
@@ -539,7 +533,7 @@
_this->createWebapp=&jk_workerEnv_createWebapp;
_this->processCallbacks=&jk_workerEnv_processCallbacks;
- _this->rootWebapp=_this->createWebapp( _this, NULL, "/", NULL );
+ _this->rootWebapp=_this->createWebapp( env, _this, NULL, "/", NULL );
return JK_TRUE;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
