costin 02/03/18 10:37:58
Modified: jk/native2/common jk_handler_logon.c jk_handler_response.c
Log:
Update the handler config. The handlers registration is still a bit
hacky, but better than previous version ( when factory returned an
array of handlers )
Revision Changes Path
1.12 +28 -15 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_handler_logon.c 21 Feb 2002 11:10:12 -0000 1.11
+++ jk_handler_logon.c 18 Mar 2002 18:37:58 -0000 1.12
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.11 $
+ * Version: $Revision: 1.12 $
*/
#include "jk_global.h"
@@ -242,37 +242,50 @@
return JK_HANDLER_FATAL;
}
-
-
-/** Register handlers
- */
-int JK_METHOD jk2_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name)
+int JK_METHOD jk2_handler_logon_init( jk_env_t *env, jk_handler_t *_this,
+ jk_workerEnv_t *wEnv)
{
- jk_map_t *map;
+ jk_pool_t *pool=wEnv->pool;
jk_handler_t *h;
-
- jk2_map_default_create( env, &map, pool );
- *result=map;
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="login";
h->messageId=AJP14_LOGSEED_CMD;
h->callback=jk2_handler_login;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="logOk";
h->messageId=AJP14_LOGOK_CMD;
h->callback=jk2_handler_logok;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="logNok";
h->messageId=AJP14_LOGNOK_CMD;
h->callback=jk2_handler_lognok;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
+
+ return JK_TRUE;
+}
+
+
+/** Register handlers
+ */
+int JK_METHOD jk2_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
+ jk_bean_t *result,
+ const char *type, const char *name)
+{
+ jk_handler_t *h;
+ h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
+
+ h->init=jk2_handler_logon_init;
+
+ result->object=h;
+
return JK_TRUE;
}
1.14 +28 -11
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_handler_response.c 21 Feb 2002 11:10:12 -0000 1.13
+++ jk_handler_response.c 18 Mar 2002 18:37:58 -0000 1.14
@@ -258,39 +258,56 @@
return JK_HANDLER_FATAL;
}
-int JK_METHOD jk2_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name)
+int JK_METHOD jk2_handler_response_init( jk_env_t *env, jk_handler_t *_this,
+ jk_workerEnv_t *wEnv)
{
- jk_map_t *map;
+ jk_pool_t *pool=wEnv->pool;
jk_handler_t *h;
- jk2_map_default_create( env, &map, pool );
- *result=map;
-
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="sendHeaders";
h->messageId=JK_AJP13_SEND_HEADERS;
h->callback=jk2_handler_startResponse;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="sendChunk";
h->messageId=JK_AJP13_SEND_BODY_CHUNK;
h->callback=jk2_handler_sendChunk;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="endResponse";
h->messageId=JK_AJP13_END_RESPONSE;
h->callback=jk2_handler_endResponse;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
h->name="getChunk";
h->messageId=JK_AJP13_GET_BODY_CHUNK;
h->callback=jk2_handler_getChunk;
- map->put( env, map, h->name, h, NULL );
+ h->workerEnv=wEnv;
+ wEnv->registerHandler( env, wEnv, h );
+
+ return JK_TRUE;
+}
+
+int JK_METHOD jk2_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
+ jk_bean_t *result,
+ const char *type, const char *name)
+{
+ jk_map_t *map;
+ jk_handler_t *h;
+
+ h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
+
+ h->init=jk2_handler_response_init;
+ result->object=h;
+
return JK_TRUE;
}
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
