hgomez 01/06/08 07:41:06
Modified: jk/src/native/common jk_worker.c jk_worker.h
Log:
Updated wc_open to use a new struct (jk_worker_env_t)
Needed by login/autoconf
Revision Changes Path
1.3 +3 -2 jakarta-tomcat-connectors/jk/src/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_worker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_worker.c 2001/06/07 14:42:49 1.2
+++ jk_worker.c 2001/06/08 14:41:02 1.3
@@ -56,7 +56,8 @@
/***************************************************************************
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Author: Henri Gomez <[EMAIL PROTECTED]> *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#define _PLACE_WORKER_LIST_HERE
@@ -74,7 +75,7 @@
jk_logger_t *l);
int wc_open(jk_map_t *init_data,
- jk_uri_worker_map_t *uw,
+ jk_worker_env_t *we,
jk_logger_t *l)
{
char **worker_list = NULL;
1.3 +19 -2 jakarta-tomcat-connectors/jk/src/native/common/jk_worker.h
Index: jk_worker.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_worker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_worker.h 2001/06/07 14:42:51 1.2
+++ jk_worker.h 2001/06/08 14:41:03 1.3
@@ -56,7 +56,8 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Author: Henri Gomez <[EMAIL PROTECTED]> *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#ifndef JK_WORKER_H
@@ -71,8 +72,24 @@
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_uri_worker_map_t *uw,
+ jk_worker_env_t *we,
jk_logger_t *l);
void wc_close(jk_logger_t *l);
