You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/04/25 21:22:19 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_pool_apr.c jk_registry.c jk_requtil.c jk_uriEnv.c jk_uriMap.c jk_vm_default.c jk_worker_ajp13.c jk_worker_jni.c jk_worker_run.c jk_worker_status.c
costin 02/04/25 12:22:19
Modified: jk/native2/common jk_pool_apr.c jk_registry.c jk_requtil.c
jk_uriEnv.c jk_uriMap.c jk_vm_default.c
jk_worker_ajp13.c jk_worker_jni.c jk_worker_run.c
jk_worker_status.c
Log:
Update rc.
Revision Changes Path
1.2 +2 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_pool_apr.c 8 Apr 2002 18:47:53 -0000 1.1
+++ jk_pool_apr.c 25 Apr 2002 19:22:19 -0000 1.2
@@ -179,7 +179,7 @@
_this->_private=aprPool;
jk2_pool_apr_initMethods( env, _this );
- return JK_TRUE;
+ return JK_OK;
}
static void jk2_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this )
@@ -204,7 +204,7 @@
result->object=_this;
- return JK_TRUE;
+ return JK_OK;
}
1.19 +2 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_registry.c 12 Apr 2002 23:09:19 -0000 1.18
+++ jk_registry.c 25 Apr 2002 19:22:19 -0000 1.19
@@ -69,7 +69,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -119,9 +119,8 @@
env->registerFactory( env, "uri", jk2_uriEnv_factory );
env->registerFactory( env, "config", jk2_config_factory );
- env->registerFactory( env, "ajp13", jk2_worker_ajp14_factory );
env->registerFactory( env, "worker.ajp13", jk2_worker_ajp14_factory );
- env->registerFactory( env, "ajp14", jk2_worker_ajp14_factory );
+ env->registerFactory( env, "ajp13", jk2_worker_ajp14_factory );
env->registerFactory( env, "lb", jk2_worker_lb_factory );
env->registerFactory( env, "worker.lb", jk2_worker_lb_factory );
env->registerFactory( env, "status", jk2_worker_status_factory );
1.12 +58 -56 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_requtil.c 19 Apr 2002 02:36:48 -0000 1.11
+++ jk_requtil.c 25 Apr 2002 19:22:19 -0000 1.12
@@ -143,7 +143,7 @@
int jk2_requtil_getMethodId(jk_env_t *env, const char *method,
unsigned char *sc)
{
- int rc = JK_TRUE;
+ int rc = JK_OK;
if(0 == strcmp(method, "GET")) {
*sc = SC_M_GET;
} else if(0 == strcmp(method, "POST")) {
@@ -187,7 +187,7 @@
} else if(0 == strcmp(method, "SEARCH")) {
*sc = SC_M_SEARCH;
} else {
- rc = JK_FALSE;
+ rc = JK_ERR;
}
return rc;
@@ -220,17 +220,17 @@
} else if(!strcasecmp(header_name + 7, "language")) {
*sc = SC_ACCEPT_LANGUAGE;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
} else if ('\0' == header_name[6]) {
*sc = SC_ACCEPT;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
} else if (!strcasecmp(header_name, "authorization")) {
*sc = SC_AUTHORIZATION;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -247,7 +247,7 @@
} else if(!strcasecmp(header_name, "cookie2")) {
*sc = SC_COOKIE2;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -256,7 +256,7 @@
if(!strcasecmp(header_name, "host")) {
*sc = SC_HOST;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -265,7 +265,7 @@
if(!strcasecmp(header_name, "pragma")) {
*sc = SC_PRAGMA;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -274,7 +274,7 @@
if(!strcasecmp(header_name, "referer")) {
*sc = SC_REFERER;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -283,7 +283,7 @@
if(!strcasecmp(header_name, "user-agent")) {
*sc = SC_USER_AGENT;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
break;
@@ -291,10 +291,10 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"requtil.getHeaderId() long header %s\n", header_name);
- return JK_FALSE;
+ return JK_ERR;
}
/* Never reached */
- return JK_TRUE;
+ return JK_OK;
}
/** Retrieve the cookie with the given name
@@ -465,7 +465,7 @@
s->outSize=bsize;
s->outBuf=(char *)s->pool->alloc( env, s->pool, bsize );
- return JK_TRUE;
+ return JK_OK;
}
static void jk2_requtil_printf(jk_env_t *env, jk_ws_service_t *s, char *fmt, ...)
@@ -528,12 +528,14 @@
unsigned char method;
int i;
int headerCount;
+ int rc;
- if (!jk2_requtil_getMethodId(env, s->method, &method)) {
+ rc=jk2_requtil_getMethodId(env, s->method, &method);
+ if (rc!=JK_OK) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"Error ajp_marshal_into_msgb - No such method %s\n",
s->method);
- return JK_FALSE;
+ return JK_ERR;
}
headerCount=s->headers_in->size(env, s->headers_in);
@@ -551,7 +553,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handle.request() Error serializing the message head\n");
- return JK_FALSE;
+ return JK_ERR;
}
for (i = 0 ; i < headerCount ; i++) {
@@ -559,13 +561,13 @@
char *name=s->headers_in->nameAt(env, s->headers_in, i);
- if (jk2_requtil_getHeaderId(env, name, &sc)) {
+ if (jk2_requtil_getHeaderId(env, name, &sc) != JK_OK) {
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "serialize.request() Add headerId %s %d\n", name, sc); */
if (msg->appendInt(env, msg, sc)) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"serialize.request() Error serializing header id\n");
- return JK_FALSE;
+ return JK_ERR;
}
} else {
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -573,7 +575,7 @@
if (msg->appendString(env, msg, name)) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"serialize.request() Error serializing header name\n");
- return JK_FALSE;
+ return JK_ERR;
}
}
@@ -581,10 +583,10 @@
/* "serialize.request() Add headerValue %s\n", */
/* s->headers_in->valueAt( env, s->headers_in, i)); */
if (msg->appendString(env, msg,
- s->headers_in->valueAt( env, s->headers_in, i))) {
+ s->headers_in->valueAt( env, s->headers_in, i))) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"serialize.request() Error serializing header value\n");
- return JK_FALSE;
+ return JK_ERR;
}
}
@@ -593,7 +595,7 @@
msg->appendString(env, msg, s->remote_user)) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"serialize.request() Error serializing user name\n");
- return JK_FALSE;
+ return JK_ERR;
}
}
if (s->auth_type) {
@@ -601,7 +603,7 @@
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;
+ return JK_ERR;
}
}
if (s->query_string) {
@@ -609,43 +611,43 @@
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;
+ return JK_ERR;
}
}
/* XXX This can be sent only on startup ( ajp14 ) */
if (s->jvm_route) {
- if (msg->appendByte(env, msg, SC_A_JVM_ROUTE) ||
- msg->appendString(env, msg, s->jvm_route)) {
+ 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;
+ return JK_ERR;
}
}
if (s->ssl_cert_len) {
- if (msg->appendByte(env, msg, SC_A_SSL_CERT) ||
- msg->appendString(env, msg, s->ssl_cert)) {
+ 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;
+ return JK_ERR;
}
}
if (s->ssl_cipher) {
- if (msg->appendByte(env, msg, SC_A_SSL_CIPHER) ||
- msg->appendString(env, msg, s->ssl_cipher)) {
+ 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;
+ return JK_ERR;
}
}
if (s->ssl_session) {
- if (msg->appendByte(env, msg, SC_A_SSL_SESSION) ||
- msg->appendString(env, msg, s->ssl_session)) {
+ 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;
+ return JK_ERR;
}
}
@@ -655,20 +657,20 @@
* JFC removed: ae->proto == AJP14_PROTO
*/
if (s->ssl_key_size != -1) {
- if (msg->appendByte(env, msg, SC_A_SSL_KEY_SIZE) ||
- msg->appendInt(env, msg, (unsigned short) s->ssl_key_size)) {
+ 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;
+ return JK_ERR;
}
}
if (ae->worker->secret ) {
- if (msg->appendByte(env, msg, SC_A_SECRET) ||
- msg->appendString(env, msg, ae->worker->secret )) {
+ if ( msg->appendByte(env, msg, SC_A_SECRET) ||
+ msg->appendString(env, msg, ae->worker->secret )) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handle.request() Error serializing secret\n");
- return JK_FALSE;
+ return JK_ERR;
}
}
@@ -677,28 +679,28 @@
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)) {
+ 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;
+ return JK_ERR;
}
}
}
- if (msg->appendByte(env, msg, SC_A_ARE_DONE)) {
+ 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;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
"serialize.request() serialized %s\n", s->req_uri);
/* msg->dump( env, msg, "Dump: " ); */
- return JK_TRUE;
+ return JK_OK;
}
@@ -715,19 +717,19 @@
}
if(len <= 0) {
len = 0;
- return JK_TRUE;
+ return JK_OK;
}
len=msg->appendFromServer( env, msg, r, ae, len );
/* the right place to add file storage for upload */
if (len >= 0) {
r->content_read += len;
- return JK_TRUE;
+ return JK_OK;
}
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"handler.marshapPostHead() - error len=%d\n", len);
- return JK_FALSE;
+ return JK_ERR;
}
/* -------------------- Request encoding -------------------- */
@@ -774,18 +776,18 @@
while ((c = *s)) {
if (TEST_CHAR(c, T_OS_ESCAPE_PATH)) {
if (d >= ee )
- return JK_FALSE;
+ return JK_ERR;
d = c2x(c, d);
}
else {
if (d >= e )
- return JK_FALSE;
+ return JK_ERR;
*d++ = c;
}
++s;
}
*d = '\0';
- return JK_TRUE;
+ return JK_OK;
}
/* XXX Make it a default checking in uri worker map
@@ -845,7 +847,7 @@
else if (badpath)
return -2;
else
- return 0;
+ return JK_OK;
}
void jk_requtil_getParents(char *name)
1.9 +8 -8 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_uriEnv.c 12 Apr 2002 21:49:03 -0000 1.8
+++ jk_uriEnv.c 25 Apr 2002 19:22:19 -0000 1.9
@@ -80,7 +80,7 @@
if( slash==NULL ) {
env->l->jkLog( env, env->l, JK_LOG_ERROR,
"uriEnv.parseUri(): At least a '/' must be included %s\n", name);
- return JK_FALSE;
+ return JK_ERR;
}
/* Cut the "uri." prefix, if any */
@@ -104,7 +104,7 @@
jk2_uriEnv_init(env, uriEnv);
/* env->l->jkLog( env, env->l, JK_LOG_INFO, */
/* "uriEnv.parseUri() Setting path %s for %s\n", n, name); */
- return JK_TRUE;
+ return JK_OK;
}
static void * JK_METHOD jk2_uriEnv_getAttribute(jk_env_t *env, jk_bean_t *bean,
@@ -157,7 +157,7 @@
uriEnv->virtual=uriEnv->pool->pstrdup(env, uriEnv->pool, val);
}
- return JK_TRUE;
+ return JK_OK;
}
@@ -168,7 +168,7 @@
char *uri=uriEnv->pool->pstrdup( env, uriEnv->pool, uriEnv->uri);
if( uri==NULL )
- return JK_FALSE;
+ return JK_ERR;
if ('/' != uri[0]) {
/*
@@ -180,7 +180,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"uriMap.addMapping() context must start with '/' in %s\n",
uri);
- return JK_FALSE;
+ return JK_ERR;
}
asterisk = strchr(uri, '*');
@@ -197,7 +197,7 @@
"uriMap.addMapping() exact mapping %s=%s was added\n",
uri, uriEnv->workerName);
}
- return JK_TRUE;
+ return JK_OK;
}
/*
@@ -260,7 +260,7 @@
}
}
- return JK_TRUE;
+ return JK_OK;
}
static char *myAttInfo[]={ "host", "uri", "worker", NULL };
@@ -299,6 +299,6 @@
uriEnv->workerEnv=env->getByName( env, "workerEnv" );
uriEnv->workerEnv->uriMap->addUriEnv( env, uriEnv->workerEnv->uriMap,
uriEnv );
- return JK_TRUE;
+ return JK_OK;
}
1.25 +24 -20 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_uriMap.c 24 Apr 2002 23:12:50 -0000 1.24
+++ jk_uriMap.c 25 Apr 2002 19:22:19 -0000 1.25
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <sh...@il.ibm.com>
- * Version: $Revision: 1.24 $
+ * Version: $Revision: 1.25 $
*/
#include "jk_pool.h"
@@ -128,14 +128,14 @@
* Security violation !!!
* this is a fraud.
*/
- return JK_FALSE;
+ return JK_ERR;
}
}
}
}
}
- return JK_TRUE;
+ return JK_OK;
}
@@ -155,7 +155,7 @@
sizeof(jk_uriEnv_t *) * capacity);
if (! uwr)
- return JK_FALSE;
+ return JK_ERR;
if (_this->capacity && _this->maps)
memcpy(uwr, _this->maps,
@@ -165,7 +165,7 @@
_this->capacity = capacity;
}
- return JK_TRUE;
+ return JK_OK;
}
static int jk2_uriMap_addUriEnv( jk_env_t *env, jk_uriMap_t *uriMap, jk_uriEnv_t *uriEnv )
@@ -175,10 +175,10 @@
/* Register it */
/* make sure we have space */
rc=jk2_uriMap_realloc(env, uriMap);
- if (rc != JK_TRUE ) {
+ if (rc != JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"uriMap.addMappint() OutOfMemoryException\n");
- return JK_FALSE;
+ return JK_ERR;
}
uriMap->maps[uriMap->size] = uriEnv;
uriMap->size++;
@@ -188,7 +188,7 @@
- return JK_TRUE;
+ return JK_OK;
}
static jk_uriEnv_t *jk2_uriEnv_createUriEnv(jk_env_t *env,
@@ -233,12 +233,12 @@
{
jk_uriMap_t *_this=mbean->object;
char *value=valueP;
- int rc=JK_TRUE;
+ int rc=JK_OK;
if( strcmp( name, "debug" )==0 ) {
_this->debug=atoi( value );
} else {
- return JK_FALSE;
+ return JK_ERR;
}
return rc;
}
@@ -246,7 +246,7 @@
static int jk2_uriMap_init(jk_env_t *env, jk_uriMap_t *_this)
{
- int rc=JK_TRUE;
+ int rc=JK_OK;
int sz;
int err;
int i;
@@ -259,12 +259,12 @@
char *wname=_this->maps[i]->workerName;
if( wname!=NULL ) {
/* Backward compat. ajp13 is used as shortcut for worker.ajp13 */
- if( strncmp( wname, "worker.", 7 ) != 0 ) {
- wname=_this->pool->calloc( env, _this->pool, 10 + strlen( wname ) );
- strcpy( wname, "worker." );
- strcat( wname, _this->maps[i]->workerName );
- _this->maps[i]->workerName=wname;
- }
+/* if( strncmp( wname, "worker.", 7 ) != 0 ) { */
+/* wname=_this->pool->calloc( env, _this->pool, 10 + strlen( wname ) ); */
+/* strcpy( wname, "worker." ); */
+/* strcat( wname, _this->maps[i]->workerName ); */
+/* _this->maps[i]->workerName=wname; */
+/* } */
_this->maps[i]->worker= env->getByName( env, wname );
if( _this->maps[i]->worker==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -392,6 +392,10 @@
for(i = 0 ; i < _this->size ; i++) {
jk_uriEnv_t *uwr = _this->maps[i];
+/* if( _this->debug > 1 ) */
+/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
+/* "uriMap.mapUri() try match %s %s \n", */
+/* uri, uwr->prefix ); */
if(uwr->prefix_len < longest_match) {
/* This will also eliminate extension matches if
a prefix match was already found */
@@ -489,7 +493,7 @@
if( ! _this) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"uriMap.factory() OutOfMemoryError\n");
- return JK_FALSE;
+ return JK_ERR;
}
_this->size = 0;
@@ -504,12 +508,12 @@
_this->checkUri=jk2_uriMap_checkUri;
_this->mapUri=jk2_uriMap_mapUri;
_this->maps = NULL;
- _this->debug= 2;
+ _this->debug= 0;
result->object=_this;
result->setAttribute=jk2_uriMap_setProperty;
_this->mbean=result;
- return JK_TRUE;
+ return JK_OK;
}
1.9 +29 -27 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_vm_default.c 12 Apr 2002 23:12:16 -0000 1.8
+++ jk_vm_default.c 25 Apr 2002 19:22:19 -0000 1.9
@@ -105,7 +105,7 @@
jk_bean_t *result,
char *type, char *name)
{
- return JK_FALSE;
+ return JK_ERR;
}
#else
@@ -196,12 +196,12 @@
if(jni_create_java_vm &&
jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
- return JK_TRUE;
+ return JK_OK;
}
FreeLibrary(hInst);
}
- return JK_TRUE;
+ return JK_OK;
#elif defined(NETWARE)
int javaNlmHandle = FindNLMHandle("JVM");
if (0 == javaNlmHandle) {
@@ -224,9 +224,9 @@
if(jni_create_java_vm &&
jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
- return JK_TRUE;
+ return JK_OK;
}
- return JK_TRUE;
+ return JK_OK;
#else
void *handle;
handle = dlopen(jkvm->jvm_dll_path, RTLD_NOW | RTLD_GLOBAL);
@@ -235,7 +235,7 @@
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"Can't load native library %s : %s\n", jkvm->jvm_dll_path,
dlerror());
- return JK_FALSE;
+ return JK_ERR;
}
jni_create_java_vm = dlsym(handle, "JNI_CreateJavaVM");
@@ -251,13 +251,13 @@
"jni.loadJvm() Can't resolve symbols %s\n",
jkvm->jvm_dll_path );
dlclose(handle);
- return JK_FALSE;
+ return JK_ERR;
}
/* env->l->jkLog(env, env->l, JK_LOG_INFO, */
/* "jni.loadJvm() %s symbols resolved\n",
jkvm->jvm_dll_path); */
- return JK_TRUE;
+ return JK_OK;
#endif
}
@@ -354,7 +354,7 @@
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "jni.guessJvmDll() failed %s\n", *current);
+ "jni.guessJvmDll() failed %s\n", jvm);
current++;
}
@@ -383,22 +383,24 @@
jkvm->jvm_dll_path=jk2_vm_guessJvmDll( env, props, jkvm );
}
- if(!jkvm->jvm_dll_path ) {
- env->l->jkLog(env, env->l, JK_LOG_EMERG,
- "vm.init(): Fail-> no jvm_dll_path\n");
- return JK_FALSE;
+ if( jkvm->jvm_dll_path==NULL ) {
+ jkvm->jvm_dll_path=
+ jk2_config_replaceProperties(env, props, props->pool,"libjvm.${so}");
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
+ "vm.init(): no jvm_dll_path, will use LD_LIBRARY_PATH %s\n",
+ jkvm->jvm_dll_path);
+ } else {
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.init(): Jni lib: %s\n",
+ jkvm->jvm_dll_path );
}
-
- env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.init(): Jni lib: %s\n",
- jkvm->jvm_dll_path );
err=jk2_vm_loadJvm(env, jkvm );
- if( err!=JK_TRUE ) {
+ if( err!=JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"jni.loadJvm() Error - can't load jvm dll\n");
/* [V] no detach needed here */
- return JK_FALSE;
+ return JK_ERR;
}
@@ -420,7 +422,7 @@
if(0 != jni_get_default_java_vm_init_args(&vm_args11)) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"vm.detect() Fail-> can't get default vm init args\n");
- return JK_FALSE;
+ return JK_ERR;
}
jvm_version= vm_args11.version;
@@ -428,7 +430,7 @@
if(jvm_version != JNI_VERSION_1_2 ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"vm.detect() found: %X expecting 1.2\n", vm_args.version);
- return JK_FALSE;
+ return JK_ERR;
}
vm_args.version = JNI_VERSION_1_2;
@@ -459,15 +461,15 @@
if (NULL == jvm) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"vm.open1() error attaching %d\n", err);
- return JK_FALSE;
+ return JK_ERR;
}
jkvm->jvm=jvm;
- return JK_TRUE;
+ return JK_OK;
} else if( err!=0 ) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"Fail-> could not create JVM, code: %d \n", err);
- return JK_FALSE;
+ return JK_ERR;
}
jkvm->jvm=jvm;
@@ -475,7 +477,7 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"vm.open2() done\n");
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD
@@ -490,10 +492,10 @@
} else if( strcmp( name, "JVM" )==0 ) {
jkvm->jvm_dll_path=value;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
- return JK_TRUE;
+ return JK_OK;
}
@@ -525,7 +527,7 @@
workerEnv->vm=jkvm;
- return JK_TRUE;
+ return JK_OK;
}
#endif /* Java2 */
1.9 +43 -42 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_worker_ajp13.c 12 Apr 2002 21:49:03 -0000 1.8
+++ jk_worker_ajp13.c 25 Apr 2002 19:22:19 -0000 1.9
@@ -145,13 +145,13 @@
} else {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.setProperty() Unknown property %s %s %s\n", mbean->name, name, value );
- return JK_FALSE;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.setProperty() %s %s %s\n", mbean->name, name, value );
- return JK_TRUE;
+ return JK_OK;
}
#define JK_AJP13_PING (unsigned char)8
@@ -176,10 +176,10 @@
msg->reset(env, msg);
rc= msg->appendByte( env, msg, JK_AJP13_PING);
- if (rc!=JK_TRUE )
- return JK_FALSE;
+ if (rc!=JK_OK )
+ return JK_ERR;
- return JK_TRUE;
+ return JK_OK;
}
@@ -211,7 +211,7 @@
if( channel==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.connect() no channel %s\n", ae->worker->mbean->name );
- return JK_FALSE;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -219,15 +219,15 @@
err=channel->open( env, channel, ae );
- if( err != JK_TRUE ) {
+ if( err != JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.connect() failed %s\n", ae->worker->mbean->name );
- return JK_FALSE;
+ return JK_ERR;
}
/* Check if we must execute a logon after the physical connect */
if (ae->worker->secret == NULL)
- return JK_TRUE;
+ return JK_OK;
/* Do the logon process */
env->l->jkLog(env, env->l, JK_LOG_INFO, "ajp14.connect() logging in\n" );
@@ -247,7 +247,7 @@
/* Anything but OK - the login failed
*/
- if( err != JK_TRUE ) {
+ if( err != JK_OK ) {
jk2_close_endpoint( env, ae );
}
return err;
@@ -283,7 +283,7 @@
err=e->worker->channel->send( env, e->worker->channel, e,
e->request );
- if (err==JK_TRUE ) {
+ if (err==JK_OK ) {
/* We sent the request, have valid endpoint */
break;
}
@@ -292,7 +292,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() error sending request %s, giving up\n",
worker->mbean->name);
- return JK_FALSE;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -303,11 +303,11 @@
err=jk2_worker_ajp14_connect(env, e);
- if( err != JK_TRUE ) {
+ if( err != JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() failed to reconnect endpoint errno=%d\n",
errno);
- return JK_FALSE;
+ return JK_ERR;
}
/*
@@ -316,7 +316,7 @@
*/
e->recoverable = JK_FALSE;
}
- return JK_TRUE;
+ return JK_OK;
}
@@ -328,7 +328,7 @@
int err;
err=jk2_worker_ajp14_sendAndReconnect( env, worker, s, e );
- if( err!=JK_TRUE )
+ if( err!=JK_OK )
return err;
/* We should have a channel now, send the post data */
@@ -347,13 +347,13 @@
*/
err=jk2_serialize_postHead( env, e->post, s, e );
- if (err != JK_TRUE ) {
+ if (err != JK_OK ) {
/* the browser stop sending data, no need to recover */
e->recoverable = JK_FALSE;
s->is_recoverable_error = JK_FALSE;
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() Error receiving initial post \n");
- return JK_FALSE;
+ return JK_ERR;
}
err= e->worker->channel->send( env, e->worker->channel, e,
e->post );
@@ -374,10 +374,10 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() ajpGetReply unrecoverable error %d\n",
err);
- return JK_FALSE;
+ return JK_ERR;
}
- if( err != JK_TRUE ) {
+ if( err != JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() ajpGetReply recoverable error %d\n",
err);
@@ -393,14 +393,15 @@
int err;
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "ajp14.forwardST() Before calling native channel\n");
+ "ajp14.forwardST() Before calling native channel %s\n",
+ e->worker->channel->mbean->name);
err=e->worker->channel->send( env, e->worker->channel, e,
e->request );
- env->l->jkLog(env, env->l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.forwardST() After %d\n",err);
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD
@@ -413,13 +414,13 @@
if( ( e== NULL ) || ( s == NULL ) ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service() NullPointerException\n");
- return JK_FALSE;
+ return JK_ERR;
}
-
+
if( w->channel==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.service() no channel defined, error in init\n", w->mbean->name);
- return JK_FALSE;
+ return JK_ERR;
}
e->currentRequest=s;
@@ -442,11 +443,11 @@
* We get here initial request (in reqmsg)
*/
err=jk2_serialize_request13(env, e->request, s, e);
- if (err!=JK_TRUE) {
+ if (err!=JK_OK) {
s->is_recoverable_error = JK_FALSE;
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.service(): error marshaling\n");
- return JK_FALSE;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
@@ -490,11 +491,11 @@
if (w->endpointCache != NULL ) {
int err=0;
err=w->endpointCache->put( env, w->endpointCache, e );
- if( err==JK_TRUE ) {
+ if( err==JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.done() return to pool %s\n",
w->mbean->name );
- return JK_TRUE;
+ return JK_OK;
}
}
@@ -505,7 +506,7 @@
"ajp14.done() close endpoint %s\n",
w->mbean->name );
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD
@@ -528,18 +529,18 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"ajp14.getEndpoint(): Reusing endpoint\n");
*eP = e;
- return JK_TRUE;
+ return JK_OK;
}
}
jkb=env->createBean2( env,ajp14->pool, "endpoint", NULL );
if( jkb==NULL )
- return JK_FALSE;
+ return JK_ERR;
e = (jk_endpoint_t *)jkb->object;
e->worker = ajp14;
*eP = e;
- return JK_TRUE;
+ return JK_OK;
}
/*
@@ -576,7 +577,7 @@
if( ajp14->endpointCache != NULL ) {
rc=ajp14->endpointCache->init( env, ajp14->endpointCache,
ajp14->cache_sz );
- if( rc!= JK_TRUE ) {
+ if( rc!= JK_OK ) {
ajp14->endpointCache=NULL;
}
}
@@ -628,7 +629,7 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.init(): can't create channel %s\n",
ajp14->channelName);
- return JK_FALSE;
+ return JK_ERR;
}
ajp14->channel = chB->object;
@@ -636,10 +637,10 @@
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.init(): no channel found %s\n",
ajp14->channelName);
- return JK_FALSE;
+ return JK_ERR;
}
rc=ajp14->workerEnv->initChannel( env, ajp14->workerEnv, ajp14->channel );
- if( rc != JK_TRUE ) {
+ if( rc != JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.init(): channel init failed\n");
}
@@ -648,7 +649,7 @@
ajp14->channel->worker=ajp14;
- return JK_TRUE;
+ return JK_OK;
}
@@ -683,7 +684,7 @@
ajp14->pool->close( env, ajp14->pool );
- return JK_TRUE;
+ return JK_OK;
}
int JK_METHOD jk2_worker_ajp14_factory( jk_env_t *env, jk_pool_t *pool,
@@ -695,7 +696,7 @@
if (name == NULL || w == NULL) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"ajp14.factory() NullPointerException\n");
- return JK_FALSE;
+ return JK_ERR;
}
w->pool = pool;
w->cache_sz=-1;
@@ -719,5 +720,5 @@
result->getAttributeInfo=myAttInfo;
- return JK_TRUE;
+ return JK_OK;
}
1.11 +20 -20 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_worker_jni.c 18 Apr 2002 19:29:08 -0000 1.10
+++ jk_worker_jni.c 25 Apr 2002 19:22:19 -0000 1.11
@@ -98,17 +98,17 @@
if(!p->jk_main_method) {
env->l->jkLog(env, env->l, JK_LOG_EMERG, "Can't find main()\n");
- return JK_FALSE;
+ return JK_ERR;
}
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD jk2_jni_worker_service(jk_env_t *env,
jk_worker_t *w,
jk_ws_service_t *s)
{
- return JK_FALSE;
+ return JK_ERR;
}
@@ -125,7 +125,7 @@
if(! pThis || ! pThis->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"In validate, assert failed - invalid parameters\n");
- return JK_FALSE;
+ return JK_ERR;
}
jniWorker = pThis->worker_private;
@@ -145,10 +145,10 @@
jniWorker->args[jniWorker->nArgs]=value;
jniWorker->nArgs++;
} else {
- return JK_FALSE;
+ return JK_ERR;
}
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD jk2_jni_worker_init(jk_env_t *env, jk_worker_t *_this)
@@ -170,13 +170,13 @@
if(! _this || ! _this->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"In init, assert failed - invalid parameters\n");
- return JK_FALSE;
+ return JK_ERR;
}
if( vm == NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"workerJni.init() No VM found\n");
- return JK_FALSE;
+ return JK_ERR;
}
jniWorker = _this->worker_private;
@@ -193,7 +193,7 @@
if( jniEnv==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"workerJni.init() Can't attach to VM\n");
- return JK_FALSE;
+ return JK_ERR;
}
jniWorker->jk_java_bridge_class =
@@ -219,19 +219,19 @@
"Can't find class %s\n", jniWorker->className );
/* [V] the detach here may segfault on 1.1 JVM... */
vm->detach(env, vm);
- return JK_FALSE;
+ return JK_ERR;
}
env->l->jkLog(env, env->l, JK_LOG_INFO,
"Loaded %s\n", jniWorker->className);
rc=jk2_get_method_ids(env, jniWorker, jniEnv);
- if( !rc ) {
+ if( rc!=JK_OK ) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
- "Fail-> can't get method ids\n");
+ "jniWorker: Fail-> can't get method ids\n");
/* [V] the detach here may segfault on 1.1 JVM... */
vm->detach(env, vm);
- return JK_FALSE;
+ return rc;
}
jstringClass=(*jniEnv)->FindClass(jniEnv, "java/lang/String" );
@@ -257,7 +257,7 @@
jargs);
vm->detach(env, vm);
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD jk2_jni_worker_destroy(jk_env_t *env, jk_worker_t *_this)
@@ -269,7 +269,7 @@
if(!_this || ! _this->worker_private) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"In destroy, assert failed - invalid parameters\n");
- return JK_FALSE;
+ return JK_ERR;
}
jniWorker = _this->worker_private;
@@ -284,7 +284,7 @@
/* if(! jniWorker->jk_shutdown_method) { */
/* env->l->jkLog(env, env->l, JK_LOG_EMERG, */
/* "In destroy, Tomcat not intantiated\n"); */
-/* return JK_FALSE; */
+/* return JK_ERR; */
/* } */
/* if((jniEnv = vm->attach(env, vm))) { */
@@ -300,7 +300,7 @@
env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() done\n");
- return JK_TRUE;
+ return JK_OK;
}
int JK_METHOD jk2_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
@@ -314,7 +314,7 @@
if(name==NULL) {
env->l->jkLog(env, env->l, JK_LOG_EMERG,
"jni.factory() NullPointerException name==null\n");
- return JK_FALSE;
+ return JK_ERR;
}
/* No singleton - you can have multiple jni workers,
@@ -327,7 +327,7 @@
if(_this==NULL || jniData==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"jni.factory() OutOfMemoryException \n");
- return JK_FALSE;
+ return JK_ERR;
}
_this->worker_private=jniData;
@@ -351,6 +351,6 @@
_this->workerEnv=env->getByName( env, "workerEnv" );
_this->workerEnv->addWorker( env, _this->workerEnv, _this );
- return JK_TRUE;
+ return JK_OK;
}
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_worker_run.c 18 Mar 2002 18:24:23 -0000 1.5
+++ jk_worker_run.c 25 Apr 2002 19:22:19 -0000 1.6
@@ -88,7 +88,7 @@
s->head(env, s );
s->afterRequest( env, s);
- return JK_TRUE;
+ return JK_OK;
}
static int JK_METHOD jk2_worker_run_destroy(jk_env_t *env, jk_worker_t *w)
@@ -98,12 +98,12 @@
if(w==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"run_worker.destroy() NullPointerException\n");
- return JK_FALSE;
+ return JK_ERR;
}
w->pool->close(env, w->pool);
- return JK_TRUE;
+ return JK_OK;
}
@@ -116,7 +116,7 @@
if(NULL == name ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"run_worker.factory() NullPointerException\n");
- return JK_FALSE;
+ return JK_ERR;
}
_this = (jk_worker_t *)pool->calloc(env, pool, sizeof(jk_worker_t));
@@ -124,7 +124,7 @@
if(_this==NULL) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"run_worker.factory() OutOfMemoryException\n");
- return JK_FALSE;
+ return JK_ERR;
}
_this->pool=pool;
@@ -137,6 +137,6 @@
_this->workerEnv=env->getByName( env, "workerEnv" );
_this->workerEnv->addWorker( env, _this->workerEnv, _this );
- return JK_TRUE;
+ return JK_OK;
}
1.14 +3 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_worker_status.c 27 Mar 2002 18:58:57 -0000 1.13
+++ jk_worker_status.c 25 Apr 2002 19:22:19 -0000 1.14
@@ -207,7 +207,7 @@
s->afterRequest( env, s);
fprintf(stderr, "After req %s \n", s);
- return JK_TRUE;
+ return JK_OK;
}
@@ -222,7 +222,7 @@
if(_this==NULL) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
"status_worker.factory() OutOfMemoryException\n");
- return JK_FALSE;
+ return JK_ERR;
}
_this->pool = pool;
@@ -235,6 +235,6 @@
_this->workerEnv=env->getByName( env, "workerEnv" );
_this->workerEnv->addWorker( env, _this->workerEnv, _this );
- return JK_TRUE;
+ return JK_OK;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>