costin 02/05/15 12:45:45
Modified: jk/native2/common jk_handler_logon.c jk_handler_response.c
jk_registry.c jk_shm.c jk_uriEnv.c jk_worker_lb.c
Log:
Various other fixes / cosmetic changes.
Note that 'recoverable' in endpoint is used to indicate a protocol ( ajp )
failure, and will disconnect tomcat. We do this more consistently now.
'reuse' is no longer used, we disconnect only if a protocol error happens.
( reuse wasn't used in the past - tomcat sent 'true' in all cases)
Revision Changes Path
1.16 +8 -7 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_handler_logon.c 14 May 2002 17:27:21 -0000 1.15
+++ jk_handler_logon.c 15 May 2002 19:45:45 -0000 1.16
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.15 $
+ * Version: $Revision: 1.16 $
*/
#include "jk_global.h"
@@ -193,16 +193,17 @@
/* take care of removing previously allocated data */
/* XXXXXXXXX NEED A SUB POOL !!!! */
- if (ae->servletContainerName == NULL ||
- strcmp( sname, ae->servletContainerName) != 0 ) {
- ae->servletContainerName=
- (char *)ae->pool->pstrdup( env, ae->pool,sname );
- }
+ /*
+ if (ae->servletContainerName == NULL ||
+ strcmp( sname, ae->servletContainerName) != 0 ) {
+ ae->servletContainerName=
+ (char *)ae->pool->pstrdup( env, ae->pool,sname );
+ }
env->l->jkLog(env, env->l, JK_LOG_INFO,
"handler.logok() Successfully connected to %s\n",
ae->servletContainerName);
-
+ */
return JK_HANDLER_LAST;
}
1.19 +6 -3
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_handler_response.c 9 May 2002 21:12:15 -0000 1.18
+++ jk_handler_response.c 15 May 2002 19:45:45 -0000 1.19
@@ -207,14 +207,17 @@
static int JK_METHOD jk2_handler_endResponse(jk_env_t *env, void *target,
jk_endpoint_t *ae, jk_msg_t *msg )
{
- ae->reuse = (int)msg->getByte(env, msg);
+ int reuse = (int)msg->getByte(env, msg);
- if((ae->reuse & 0X01) != ae->reuse) {
+ if((reuse & 0X01) != reuse) {
/*
* Strange protocol error.
*/
- ae->reuse = JK_FALSE;
+ reuse = JK_FALSE;
}
+ if( reuse==JK_FALSE )
+ ae->recoverable=JK_FALSE;
+
return JK_HANDLER_LAST;
}
1.22 +1 -5 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_registry.c 10 May 2002 23:45:18 -0000 1.21
+++ jk_registry.c 15 May 2002 19:45:45 -0000 1.22
@@ -62,16 +62,12 @@
#include "jk_service.h"
#include "jk_env.h"
-#ifdef HAS_APR
-#include "apr.h"
-#endif
-
#include "jk_registry.h"
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.21 $ *
+ * Version: $Revision: 1.22 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
1.15 +3 -0 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_shm.c 13 May 2002 08:57:56 -0000 1.14
+++ jk_shm.c 15 May 2002 19:45:45 -0000 1.15
@@ -330,6 +330,8 @@
/* XXX interprocess sync */
slotId=shm->head->lastSlot++;
slot=shm->getSlot( env, shm, slotId );
+
+ if( slot==NULL ) return NULL;
env->l->jkLog(env, env->l, JK_LOG_INFO,
"shm.createSlot() Create %d %p %p\n", slotId, shm->image, slot );
@@ -489,6 +491,7 @@
shm->createSlot=jk2_shm_createSlot;
shm->getId=jk2_shm_getId;
shm->init=jk2_shm_init;
+ shm->reset=jk2_shm_reset;
shm->destroy=jk2_shm_detach;
shm->setWorkerEnv=jk2_shm_setWorkerEnv;
1.19 +5 -0 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_uriEnv.c 14 May 2002 17:18:42 -0000 1.18
+++ jk_uriEnv.c 15 May 2002 19:45:45 -0000 1.19
@@ -159,6 +159,8 @@
return JK_OK;
} else if( strcmp("servlet", name) == 0 ) {
uriEnv->servlet=val;
+ } else if( strcmp("timing", name) == 0 ) {
+ uriEnv->timing=atoi( val );
} else if( strcmp("alias", name) == 0 ) {
if( uriEnv->match_type == MATCH_TYPE_HOST ) {
if( uriEnv->aliases==NULL ) {
@@ -202,6 +204,9 @@
/* Set the worker */
char *wname=uriEnv->workerName;
+ if( uriEnv->workerEnv->timing == JK_TRUE ) {
+ uriEnv->timing=JK_TRUE;
+ }
if( uriEnv->workerName == NULL ) {
/* The default worker */
uriEnv->workerName=uriEnv->uriMap->workerEnv->defaultWorker->mbean->name;;
1.16 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_worker_lb.c 14 May 2002 20:41:35 -0000 1.15
+++ jk_worker_lb.c 15 May 2002 19:45:45 -0000 1.16
@@ -456,11 +456,11 @@
/* Already added */
return JK_OK;
}
- name = lb->mbean->pool->pstrdup(env, lb->mbean->pool, name);
- lb->lbWorkerMap->add(env, lb->lbWorkerMap, name, "");
+ value = lb->mbean->pool->pstrdup(env, lb->mbean->pool, value);
+ lb->lbWorkerMap->add(env, lb->lbWorkerMap, value, "");
env->l->jkLog(env, env->l, JK_LOG_INFO,
- "lb_worker.setAttribute(): Adding to %s: %s\n",
lb->mbean->localName, name);
+ "lb_worker.setAttribute(): Adding to %s: %s\n",
lb->mbean->localName, value);
jk2_lb_refresh( env, lb );
return JK_OK;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
