cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h jk_util.h
mturk 2005/02/19 02:54:49 Modified:jk/native/common jk_service.h jk_util.h Log: Move init service proto to correct header. Revision ChangesPath 1.30 +5 -2 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_service.h 16 Feb 2005 15:09:21 - 1.29 +++ jk_service.h 19 Feb 2005 10:54:49 - 1.30 @@ -27,10 +27,10 @@ #ifndef JK_SERVICE_H #define JK_SERVICE_H -#include jk_map.h #include jk_global.h #include jk_logger.h #include jk_pool.h +#include jk_map.h #include jk_uri_worker_map.h #include jk_msg_buff.h @@ -430,6 +430,9 @@ const char *name, jk_logger_t *l); +void jk_init_ws_service(jk_ws_service_t *s); + + #ifdef __cplusplus } #endif /* __cplusplus */ 1.29 +1 -3 jakarta-tomcat-connectors/jk/native/common/jk_util.h Index: jk_util.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- jk_util.h 17 Feb 2005 07:07:51 - 1.28 +++ jk_util.h 19 Feb 2005 10:54:49 - 1.29 @@ -137,8 +137,6 @@ void jk_append_libpath(jk_pool_t *p, const char *libpath); -void jk_init_ws_service(jk_ws_service_t *s); - void jk_set_worker_def_cache_size(int sz); int jk_get_worker_def_cache_size(int protocol); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h jk_worker.c
mturk 2005/02/14 09:26:34
Modified:jk/native/common jk_service.h jk_worker.c
Log:
Add worker type to structure, so status can decide which private to use.
Revision ChangesPath
1.27 +5 -2 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_service.h 14 Feb 2005 07:57:18 - 1.26
+++ jk_service.h 14 Feb 2005 17:26:34 - 1.27
@@ -278,6 +278,8 @@
*/
struct jk_endpoint
{
+size_t rd;
+size_t wr;
/*
* A 'this' pointer which is used by the subclasses of this class to
@@ -361,7 +363,8 @@
* (e.g. ajp12 or ajp13 or ajp14).
*/
void *worker_private;
-
+
+const char *type;
/*
* For all of the below (except destroy), the first argument is
* essentially a 'this' pointer.
1.30 +2 -2 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_worker.c 13 Feb 2005 12:20:01 - 1.29
+++ jk_worker.c 14 Feb 2005 17:26:34 - 1.30
@@ -169,7 +169,7 @@
}
}
}
-
+w-type = type;
*rc = w;
JK_TRACE_EXIT(l);
return JK_TRUE;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
mturk 2005/02/13 04:19:22 Modified:jk/native/common jk_service.h Log: Add worker_list to worker_env, so we can get all workers. Add worker_map to service, so it can be updated on per-vhost basis. Revision ChangesPath 1.25 +7 -2 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jk_service.h 12 Feb 2005 17:06:34 - 1.24 +++ jk_service.h 13 Feb 2005 12:19:22 - 1.25 @@ -54,7 +54,7 @@ jk_uri_worker_map_t *uri_to_worker; int num_of_workers; -char *first_worker; +char **worker_list; /* Web-Server we're running on (Apache/IIS/NES) */ char *server_name; @@ -215,6 +215,11 @@ /* Number of retries. Defaults to JK_RETRIES */ int retries; + +/* Uri worker map. Added for virtual host support + */ +jk_uri_worker_map_t *uw_map; + /* * Send the response headers to the browser. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
mturk 2005/02/13 23:57:18 Modified:jk/native/common jk_service.h Log: Change num_of workers to unsigned, to match the api. Revision ChangesPath 1.26 +2 -2 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_service.h 13 Feb 2005 12:19:22 - 1.25 +++ jk_service.h 14 Feb 2005 07:57:18 - 1.26 @@ -53,7 +53,7 @@ /* The URI to WORKER map, will be feeded by AJP14 autoconf feature */ jk_uri_worker_map_t *uri_to_worker; -int num_of_workers; +unsigned int num_of_workers; char **worker_list; /* Web-Server we're running on (Apache/IIS/NES) */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
mturk 2005/02/12 09:06:34 Modified:jk/native/common jk_service.h Log: Add update worker method when for dynamic update of worker properties, either by reloading workers.properties file or via jk_status. Revision ChangesPath 1.24 +8 -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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_service.h 12 Feb 2005 11:55:33 - 1.23 +++ jk_service.h 12 Feb 2005 17:06:34 - 1.24 @@ -374,6 +374,13 @@ jk_worker_env_t *we, jk_logger_t *l); /* + * Update worker either from jk_status or reloading from workers.properties + */ +int (JK_METHOD * update) (jk_worker_t *w, + jk_map_t *props, + jk_worker_env_t *we, jk_logger_t *l); + +/* * Do whatever initialization needs to be done to start this worker up. * Configuration options are passed in via the props parameter. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
mturk 2004/11/08 05:33:21
Modified:jk/native/common jk_service.h
Log:
Format code
Revision ChangesPath
1.19 +236 -236 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_service.h 8 Oct 2004 07:50:40 - 1.18
+++ jk_service.h 8 Nov 2004 13:33:21 - 1.19
@@ -45,29 +45,29 @@
* about web-server, uri to worker map
*/
-struct jk_worker_env
-{
+struct jk_worker_env
+{
-/* The URI to WORKER map, will be feeded by AJP14 autoconf feature */
-jk_uri_worker_map_t *uri_to_worker;
+/* The URI to WORKER map, will be feeded by AJP14 autoconf feature */
+jk_uri_worker_map_t *uri_to_worker;
-int num_of_workers;
-char *first_worker;
+int num_of_workers;
+char *first_worker;
-/* Web-Server we're running on (Apache/IIS/NES) */
-char *server_name;
-
-/* Virtual server handled - * is all virtual */
-char *virtual;
-};
-typedef struct jk_worker_env jk_worker_env_t;
-
-struct jk_ws_service;
-struct jk_endpoint;
-struct jk_worker;
-typedef struct jk_ws_service jk_ws_service_t;
-typedef struct jk_endpoint jk_endpoint_t;
-typedef struct jk_worker jk_worker_t;
+/* Web-Server we're running on (Apache/IIS/NES) */
+char *server_name;
+
+/* Virtual server handled - * is all virtual */
+char *virtual;
+};
+typedef struct jk_worker_env jk_worker_env_t;
+
+struct jk_ws_service;
+struct jk_endpoint;
+struct jk_worker;
+typedef struct jk_ws_service jk_ws_service_t;
+typedef struct jk_endpoint jk_endpoint_t;
+typedef struct jk_worker jk_worker_t;
/*
* The web server service 'class'. An instance of this class is created
@@ -97,144 +97,144 @@
*
* See apache1.3/mod_jk.c and iis/jk_isapi_plugin.c for examples.
*/
-struct jk_ws_service
-{
+struct jk_ws_service
+{
-/*
- * A 'this' pointer which is used by the subclasses of this class to
- * point to data which is specific to a given web server platform
- * (e.g. Apache or IIS).
- */
-void *ws_private;
-
-/*
- * Provides memory management. All data specific to this request is
- * allocated within this pool, which can then be reclaimed at the end
- * of the request handling cycle.
- *
- * Alive as long as the request is alive.
- */
-jk_pool_t *pool;
-
-/*
- * CGI Environment needed by servlets
- */
-char *method;
-char *protocol;
-char *req_uri;
-char *remote_addr;
-char *remote_host;
-char *remote_user;
-char *auth_type;
-char *query_string;
-char *server_name;
-unsigned server_port;
-char *server_software;
-unsigned content_length;/* integer that represents the
content */
-/* length should be 0 if unknown.*/
-unsigned is_chunked;/* 1 if content length is unknown (chunked
rq) */
-unsigned no_more_chunks;/* 1 if last chunk has been read */
-unsigned content_read; /* number of bytes read */
-
-/*
- * SSL information
- *
- * is_ssl - True if request is in ssl connection
- * ssl_cert - If available, base64 ASN.1 encoded client
certificates.
- * ssl_cert_len - Length of ssl_cert, 0 if certificates are not
available.
- * ssl_cipher - The ssl cipher suite in use.
- * ssl_session - The ssl session string
- *
- * In some servers it is impossible to extract all this information,
in this
- * case, we are passing NULL.
- */
-int is_ssl;
-char *ssl_cert;
-unsigned ssl_cert_len;
-char *ssl_cipher;
-char *ssl_session;
-
-/*
- * SSL extra information for Servlet 2.3 API
- *
- * ssl_key_size - ssl key size in use
- */
-int ssl_key_size;
-
-/*
- * Headers, names and values.
- */
-char **headers_names; /* Names of the request headers */
-char **headers_values; /* Values of the request headers */
-unsigned num_headers; /* Number of request headers */
-
-
-/*
- * Request attributes.
- *
- * These attributes that were extracted from the web server and are
- * sent to
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
costin 01/11/16 14:43:18 Modified:jk/native/common jk_service.h Log: Added 2 fields in jk_endpoint_t to support jk_channel. Note that use of a channel ( as an abstraction that replace socket calls ) is optional - will be ifdef-ed until we make sure everything works fine. Revision ChangesPath 1.10 +13 -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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_service.h 2001/10/13 17:36:36 1.9 +++ jk_service.h 2001/11/16 22:43:18 1.10 @@ -63,7 +63,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Dan Milstein [EMAIL PROTECTED]* * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.9 $ * + * Version: $Revision: 1.10 $ * ***/ #ifndef JK_SERVICE_H @@ -104,6 +104,7 @@ struct jk_ws_service; struct jk_endpoint; struct jk_worker; +struct jk_channel; typedef struct jk_ws_service jk_ws_service_t; typedef struct jk_endpoint jk_endpoint_t; typedef struct jk_worker jk_worker_t; @@ -302,6 +303,10 @@ */ void *endpoint_private; +/** Data specific to a channel connection + */ +void *channelData; + /* * Forward a request to the servlet engine. The request is described * by the jk_ws_service_t object. I'm not sure exactly how @@ -373,6 +378,13 @@ * (e.g. ajp12 or ajp13 or ajp14). */ void *worker_private; + +/* XXX Add name and all other common properties !!! + */ + +/** Communication channle used by the worker + */ +struct jk_channel *channel; /* * For all of the below (except destroy), the first argument is -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_service.h
hgomez 01/07/02 14:11:49 Modified:jk/native/common jk_service.h Log: added virtual name in worker_env. May be to be tuned later :) Revision ChangesPath 1.6 +4 -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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_service.h 2001/06/18 14:16:04 1.5 +++ jk_service.h 2001/07/02 21:11:47 1.6 @@ -62,7 +62,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Dan Milstein [EMAIL PROTECTED]* * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***/ #ifndef JK_SERVICE_H @@ -91,6 +91,9 @@ /* Web-Server we're running on (Apache/IIS/NES) */ char *server_name; + +/* Virtual server handled - * is all virtual */ +char*virtual; }; typedef struct jk_worker_env jk_worker_env_t;
