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/05/14 19:27:22 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c jk_channel_un.c jk_handler_logon.c jk_worker_jni.c jk_worker_run.c
costin 02/05/14 10:27:22
Modified: jk/native2/common jk_channel_socket.c jk_channel_un.c
jk_handler_logon.c jk_worker_jni.c jk_worker_run.c
Log:
Cosmetic changes.
Revision Changes Path
1.24 +14 -4 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_channel_socket.c 9 May 2002 23:47:31 -0000 1.23
+++ jk_channel_socket.c 14 May 2002 17:27:21 -0000 1.24
@@ -117,6 +117,10 @@
static int JK_METHOD jk2_channel_socket_close(jk_env_t *env, jk_channel_t *ch,
jk_endpoint_t *endpoint);
+static char *jk2_channel_socket_multiValueInfo[]={"group", NULL };
+static char *jk2_channel_socket_setAttributeInfo[]={"host", "port", "route", "lb_factor",
+ "level", NULL };
+
static int JK_METHOD jk2_channel_socket_setAttribute(jk_env_t *env,
jk_bean_t *mbean,
char *name, void *valueP)
@@ -361,8 +365,9 @@
int sent=0;
jk_channel_socket_data_t *chD=endpoint->channelData;
- if( chD==NULL )
- return JK_ERR;
+ if( chD==NULL ) {
+ return JK_ERR;
+ }
msg->end( env, msg );
len=msg->len;
@@ -376,12 +381,12 @@
return -2;
}
if(this_time < 0) {
- return -3;
+ return this_time;
}
sent += this_time;
}
/* return sent; */
- return JK_OK;
+ return JK_OK; /* 0 */
}
@@ -499,6 +504,11 @@
ch->is_stream=JK_TRUE;
result->setAttribute= jk2_channel_socket_setAttribute;
+
+ //result->getAttributeInfo=jk2_channel_socket_getAttributeInfo;
+ result->multiValueInfo=jk2_channel_socket_multiValueInfo;
+ result->setAttributeInfo=jk2_channel_socket_setAttributeInfo;
+
result->object= ch;
ch->mbean=result;
1.5 +8 -9 jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c
Index: jk_channel_un.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_un.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_channel_un.c 12 May 2002 01:09:46 -0000 1.4
+++ jk_channel_un.c 14 May 2002 17:27:21 -0000 1.5
@@ -95,8 +95,11 @@
static int JK_METHOD jk2_channel_un_close(jk_env_t *env, jk_channel_t *_this,
jk_endpoint_t *endpoint);
+static char *jk2_channel_un_multiValueInfo[]={"group", NULL };
+static char *jk2_channel_un_setAttributeInfo[]={"file", "route", "lb_factor",
+ "level", NULL };
-static int JK_METHOD jk2_channel_un_setProperty(jk_env_t *env,
+static int JK_METHOD jk2_channel_un_setAttribute(jk_env_t *env,
jk_bean_t *mbean,
char *name, void *valueP)
{
@@ -239,7 +242,6 @@
}
while(sent < len) {
-/* this_time = send(unixsock, (char *)b + sent , len - sent, 0); */
errno=0;
this_time = write(unixsock, (char *)b + sent , len - sent);
@@ -247,12 +249,6 @@
env->l->jkLog(env, env->l, JK_LOG_INFO,
"channel.apr:send() write() %d %d %s\n", this_time, errno,
strerror( errno));
-/* if( errno != 0 ) { */
-/* env->l->jkLog(env, env->l, JK_LOG_ERROR, */
-/* "channel.apr:send() send() %d %d %s\n", this_time, errno, */
-/* strerror( errno)); */
-/* return -2; */
-/* } */
if(0 == this_time) {
return -2;
}
@@ -378,7 +374,9 @@
ch->close= jk2_channel_un_close;
ch->is_stream=JK_TRUE;
- result->setAttribute= jk2_channel_un_setProperty;
+ result->setAttribute= jk2_channel_un_setAttribute;
+ result->multiValueInfo=jk2_channel_un_multiValueInfo;
+ result->setAttributeInfo=jk2_channel_un_setAttributeInfo;
ch->mbean=result;
result->object= ch;
@@ -398,6 +396,7 @@
env->l->jkLog( env, env->l, JK_LOG_ERROR,
"channelUn.factory(): Support for unix sockets is disabled, "
"you need to set HAVE_UNIXSOCKETS at compile time\n");
+ result->disabled=1;
return JK_FALSE;
}
#endif
1.15 +5 -4 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_handler_logon.c 25 Apr 2002 19:14:31 -0000 1.14
+++ jk_handler_logon.c 14 May 2002 17:27:21 -0000 1.15
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <hg...@slib.fr>
- * Version: $Revision: 1.14 $
+ * Version: $Revision: 1.15 $
*/
#include "jk_global.h"
@@ -111,7 +111,8 @@
char *entropy;
char computedKey[AJP14_COMPUTED_KEY_LEN];
char *secret=ae->worker->secret;
-
+ long negociation;
+
entropy= msg->getString( env, msg );
if( entropy==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -145,9 +146,9 @@
"handler.loginSecret() error serializing computed secret\n");
return JK_HANDLER_FATAL;
}
- ae->negociation=
+ negociation=
(AJP14_CONTEXT_INFO_NEG | AJP14_PROTO_SUPPORT_AJP14_NEG);
- msg->appendLong(env, msg, ae->negociation);
+ msg->appendLong(env, msg, negociation);
rc=msg->appendString(env, msg, ae->worker->workerEnv->server_name);
1.13 +6 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_worker_jni.c 3 May 2002 17:49:12 -0000 1.12
+++ jk_worker_jni.c 14 May 2002 17:27:21 -0000 1.13
@@ -151,8 +151,9 @@
return JK_OK;
}
-static int JK_METHOD jk2_jni_worker_init(jk_env_t *env, jk_worker_t *_this)
+static int JK_METHOD jk2_jni_worker_init(jk_env_t *env, jk_bean_t *bean)
{
+ jk_worker_t *_this=bean->object;
jni_worker_data_t *jniWorker;
JNIEnv *jniEnv;
jstring cmd_line = NULL;
@@ -262,8 +263,9 @@
return JK_OK;
}
-static int JK_METHOD jk2_jni_worker_destroy(jk_env_t *env, jk_worker_t *_this)
+static int JK_METHOD jk2_jni_worker_destroy(jk_env_t *env, jk_bean_t *bean)
{
+ jk_worker_t *_this=bean->object;
jni_worker_data_t *jniWorker;
JNIEnv *jniEnv;
jk_vm_t *vm=_this->workerEnv->vm;
@@ -298,8 +300,6 @@
/* vm->detach(env, vm); */
/* } */
- _this->pool->close(env, _this->pool);
-
env->l->jkLog(env, env->l, JK_LOG_INFO, "jni.destroy() done\n");
return JK_OK;
@@ -334,16 +334,14 @@
_this->worker_private=jniData;
- _this->pool=pool;
-
jniData->jk_java_bridge_class = NULL;
jniData->classNameOptions=(char **)pool->calloc(env, pool, 4 * sizeof(char *));
jniData->args = pool->calloc( env, pool, 64 * sizeof( char *));
jniData->nArgs =0;
- _this->init = jk2_jni_worker_init;
- _this->destroy = jk2_jni_worker_destroy;
+ result->init = jk2_jni_worker_init;
+ result->destroy = jk2_jni_worker_destroy;
_this->service = jk2_jni_worker_service;
result->object = _this;
1.7 +0 -17 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_worker_run.c 25 Apr 2002 19:22:19 -0000 1.6
+++ jk_worker_run.c 14 May 2002 17:27:21 -0000 1.7
@@ -91,21 +91,6 @@
return JK_OK;
}
-static int JK_METHOD jk2_worker_run_destroy(jk_env_t *env, jk_worker_t *w)
-{
- int i = 0;
-
- if(w==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_ERROR,
- "run_worker.destroy() NullPointerException\n");
- return JK_ERR;
- }
-
- w->pool->close(env, w->pool);
-
- return JK_OK;
-}
-
int JK_METHOD jk2_worker_run_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
@@ -126,8 +111,6 @@
"run_worker.factory() OutOfMemoryException\n");
return JK_ERR;
}
-
- _this->pool=pool;
_this->service = jk2_worker_run_service;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>