hgomez 01/06/11 23:26:25
Modified: jk/native/common jk_ajp12_worker.c jk_ajp13_worker.c
jk_jni_worker.c jk_lb_worker.c jk_service.h
jk_worker.c jk_worker.h
Log:
init/validate methods of worker get now a copy of
worker_env (autoconf)
Revision Changes Path
1.2 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_ajp12_worker.c 2001/05/14 09:32:19 1.1
+++ jk_ajp12_worker.c 2001/06/12 06:26:24 1.2
@@ -57,7 +57,7 @@
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: jserv_ajpv12.c from Jserv *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include "jk_ajp12_worker.h"
@@ -177,6 +177,7 @@
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::validate\n");
@@ -210,6 +211,7 @@
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *log)
{
/* Nothing to do for now */
1.5 +7 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_ajp13_worker.c 2001/06/07 14:33:02 1.4
+++ jk_ajp13_worker.c 2001/06/12 06:26:24 1.5
@@ -58,7 +58,7 @@
* Author: Henri Gomez <[EMAIL PROTECTED]> *
* Author: Costin <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#include "jk_ajp13_worker.h"
@@ -67,17 +67,19 @@
/* -------------------- Method -------------------- */
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
- return (ajp_validate(pThis, props, l, AJP13_PROTO));
+ return (ajp_validate(pThis, props, we, l, AJP13_PROTO));
}
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
- return (ajp_init(pThis, props, l, AJP13_PROTO));
+ return (ajp_init(pThis, props, we, l, AJP13_PROTO));
}
@@ -134,6 +136,8 @@
aw->worker.get_endpoint = get_endpoint;
aw->worker.destroy = destroy;
+ aw->logon = NULL; /* No Logon on AJP13 */
+
*w = &aw->worker;
return JK_TRUE;
}
1.2 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jni_worker.c 2001/05/14 09:34:48 1.1
+++ jk_jni_worker.c 2001/06/12 06:26:25 1.2
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#if !defined(WIN32) && !defined(NETWARE)
@@ -337,6 +337,7 @@
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jni_worker_t *p;
@@ -451,6 +452,7 @@
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jni_worker_t *p;
1.2 +4 -1 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_lb_worker.c 2001/05/14 09:35:13 1.1
+++ jk_lb_worker.c 2001/06/12 06:26:25 1.2
@@ -58,7 +58,7 @@
* several workers. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -398,6 +398,7 @@
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG,
@@ -432,6 +433,7 @@
if(!wc_create_worker(p->lb_workers[i].name,
props,
&(p->lb_workers[i].w),
+ we,
l) || !p->lb_workers[i].w) {
break;
}
@@ -458,6 +460,7 @@
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *log)
{
/* Nothing to do for now */
1.4 +20 -1 jakarta-tomcat-connectors/jk/native/common/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_service.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_service.h 2001/06/04 13:42:47 1.3
+++ jk_service.h 2001/06/12 06:26:25 1.4
@@ -59,7 +59,7 @@
* JVM connection point *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Dan Milstein <[EMAIL PROTECTED]>
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -69,11 +69,28 @@
#include "jk_global.h"
#include "jk_logger.h"
#include "jk_pool.h"
+#include "jk_uri_worker_map.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+/*
+ * Env Information to be provided to worker at init time
+ * With AJP14 support we need to have access to many informations
+ * about web-server, uri to worker map....
+ */
+
+struct jk_worker_env {
+
+ /* The URI to WORKER map, will be feeded by AJP14 autoconf feature */
+ jk_uri_worker_map_t *uri_to_worker;
+
+ /* Web-Server we're running on (Apache/IIS/NES) */
+ char *server_name;
+};
+typedef struct jk_worker_env jk_worker_env_t;
+
struct jk_ws_service;
struct jk_endpoint;
struct jk_worker;
@@ -359,6 +376,7 @@
*/
int (JK_METHOD *validate)(jk_worker_t *w,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l);
/*
@@ -367,6 +385,7 @@
*/
int (JK_METHOD *init)(jk_worker_t *w,
jk_map_t *props,
+ jk_worker_env_t *we,
jk_logger_t *l);
1.4 +8 -4 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_worker.c 2001/06/08 14:41:02 1.3
+++ jk_worker.c 2001/06/12 06:26:25 1.4
@@ -57,7 +57,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#define _PLACE_WORKER_LIST_HERE
@@ -72,6 +72,7 @@
static int build_worker_map(jk_map_t *init_data,
char **worker_list,
unsigned num_of_workers,
+ jk_worker_env_t *we,
jk_logger_t *l);
int wc_open(jk_map_t *init_data,
@@ -96,6 +97,7 @@
if(!build_worker_map(init_data,
worker_list,
num_of_workers,
+ we,
l)) {
close_workers();
return JK_FALSE;
@@ -135,6 +137,7 @@
int wc_create_worker(const char *name,
jk_map_t *init_data,
jk_worker_t **rc,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into wc_create_worker\n");
@@ -161,14 +164,14 @@
}
jk_log(l, JK_LOG_DEBUG, "wc_create_worker, about to validate and init
%s\n", name);
- if(!w->validate(w, init_data, l)) {
+ if(!w->validate(w, init_data, we, l)) {
w->destroy(&w, l);
jk_log(l, JK_LOG_ERROR, "wc_create_worker validate failed for %s\n",
name);
return JK_FALSE;
}
- if(!w->init(w, init_data, l)) {
+ if(!w->init(w, init_data, we, l)) {
w->destroy(&w, l);
jk_log(l, JK_LOG_ERROR, "wc_create_worker init failed for %s\n",
name);
@@ -202,6 +205,7 @@
static int build_worker_map(jk_map_t *init_data,
char **worker_list,
unsigned num_of_workers,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
unsigned i;
@@ -215,7 +219,7 @@
jk_log(l, JK_LOG_DEBUG,
"build_worker_map, creating worker %s\n", worker_list[i]);
- if(wc_create_worker(worker_list[i], init_data, &w, l)) {
+ if(wc_create_worker(worker_list[i], init_data, &w, we, l)) {
jk_worker_t *oldw = NULL;
if(!map_put(worker_map, worker_list[i], w, (void *)&oldw)) {
w->destroy(&w, l);
1.4 +2 -17 jakarta-tomcat-connectors/jk/native/common/jk_worker.h
Index: jk_worker.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_worker.h 2001/06/08 14:41:03 1.3
+++ jk_worker.h 2001/06/12 06:26:25 1.4
@@ -57,7 +57,7 @@
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#ifndef JK_WORKER_H
@@ -72,22 +72,6 @@
extern "C" {
#endif /* __cplusplus */
-/*
- * Env Information to be provided to worker at init time
- * With AJP14 support we need to have access to many informations
- * about web-server, uri to worker map....
- */
-
-struct jk_worker_env {
-
- /* The URI to WORKER map, will be feeded by AJP14 autoconf feature */
- jk_uri_worker_map_t *uri_to_worker;
-
- /* Web-Server we're running on (Apache/IIS/NES) */
- const char *server_name;
-};
-typedef struct jk_worker_env jk_worker_env_t;
-
int wc_open(jk_map_t *init_data,
jk_worker_env_t *we,
jk_logger_t *l);
@@ -100,6 +84,7 @@
int wc_create_worker(const char *name,
jk_map_t *init_data,
jk_worker_t **rc,
+ jk_worker_env_t *we,
jk_logger_t *l);
