DO NOT REPLY [Bug 32112] New: - SSL configuration attributes / security issue
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32112. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32112 SSL configuration attributes / security issue Summary: SSL configuration attributes / security issue Product: Tomcat 5 Version: Unknown Platform: All OS/Version: All Status: NEW Severity: Enhancement Priority: Other Component: Connector:Coyote AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hello, The SSL configuration attribute 'truststorePass' shows keystore password in server.xml in clear . For more secure environment, it is good to provide the behaviour when keystore password will be asked during tomcat startup . - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[ #DIP-92652-476]: morto
Dette er en automatisk svar-epost i fra Panda Software Norge - Support. Din sak har fått nr: DIP-92652-476 Du vil motta svar på denne epost adressen når vi har fått behandlet saken. Henvis til nummeret ovenfor ved telefonhenvendelser. Ved videre henvendelser om denne saken svarer du på denne e-posten eller sender en ny mail til [EMAIL PROTECTED] med: [DIP-92652-476] i subjekt/emne feltet. This is an automatic response from Panda Software Norway. Your case has been assigned the following number: DIP-92652-476 You will receive a reply to your question as soon as possible. Further contact regarding this matter should be done by replying to the email(s) received from us, without changing the subject field. --- Panda Software Norge - Support --- [EMAIL PROTECTED] tlf: 93 40 93 00 http://www.pandasoftware.no http://www.pandasoftware.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Bug report for Watchdog [2004/11/07]
PLEASE UNSUBSCRIBE ME EMMEDIATLEY -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: 07 November 2004 15:20 To: [EMAIL PROTECTED] Subject: Bug report for Watchdog [2004/11/07] +--- + | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned | | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld urn should be uri BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward() | |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid. | |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| |24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara| |29398|New|Nor|2004-06-04|Update site and note current status | +-+---+---+--+-- + | Total 15 bugs | +--- + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Jason Stahl is out of the office.
I will be out of the office starting Mon 11.08.2004 and will not return until Fri 11.12.2004. I will respond to your message when I return. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31938] - Apache2 + mod_jk2 on FreeBSD - default socket timeout
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=31938. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=31938 Apache2 + mod_jk2 on FreeBSD - default socket timeout [EMAIL PROTECTED] changed: What|Removed |Added Priority|Other |Medium - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.c
mturk 2004/11/08 05:23:02
Modified:jk/native/common jk_ajp12_worker.c
Log:
Added timeout param to jk_open_socket
Revision ChangesPath
1.15 +3 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_ajp12_worker.c 8 Oct 2004 07:50:39 - 1.14
+++ jk_ajp12_worker.c 8 Nov 2004 13:23:01 - 1.15
@@ -16,9 +16,10 @@
/***
* Description: ajpv1.2 worker, used to call local or remote jserv hosts *
+ * This worker is deprecated *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on:jserv_ajpv12.c from Jserv *
- * Version: $Revision$ *
+ * Version: $Revision$ *
***/
#include jk_ajp12_worker.h
@@ -98,7 +99,7 @@
attempt++) {
p-sd =
jk_open_socket(p-worker-worker_inet_addr, JK_TRUE,
- JK_FALSE, l);
+ JK_FALSE, -1, l);
jk_log(l, JK_LOG_DEBUG, In jk_endpoint_t::service, sd = %d\n,
p-sd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp12_worker.h
mturk 2004/11/08 05:23:25 Modified:jk/native/common jk_ajp12_worker.h Log: Format code Revision ChangesPath 1.8 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h Index: jk_ajp12_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_ajp12_worker.h 8 Oct 2004 07:50:40 - 1.7 +++ jk_ajp12_worker.h 8 Nov 2004 13:23:25 - 1.8 @@ -33,8 +33,8 @@ #define JK_AJP12_WORKER_NAME (ajp12) -int JK_METHOD ajp12_worker_factory(jk_worker_t **w, - const char *name, jk_logger_t *l); +int JK_METHOD ajp12_worker_factory(jk_worker_t **w, + const char *name, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13.h
mturk 2004/11/08 05:24:17 Modified:jk/native/common jk_ajp13.h Log: Format code Revision ChangesPath 1.15 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h Index: jk_ajp13.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_ajp13.h8 Oct 2004 07:50:40 - 1.14 +++ jk_ajp13.h8 Nov 2004 13:24:17 - 1.15 @@ -107,8 +107,8 @@ * Functions */ -int ajp13_marshal_shutdown_into_msgb(jk_msg_buf_t *msg, - jk_pool_t *p, jk_logger_t *l); +int ajp13_marshal_shutdown_into_msgb(jk_msg_buf_t *msg, + jk_pool_t *p, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13_worker.h
mturk 2004/11/08 05:24:46 Modified:jk/native/common jk_ajp13_worker.h Log: Format code Revision ChangesPath 1.10 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h Index: jk_ajp13_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jk_ajp13_worker.h 8 Oct 2004 07:50:40 - 1.9 +++ jk_ajp13_worker.h 8 Nov 2004 13:24:46 - 1.10 @@ -38,8 +38,8 @@ #define JK_AJP13_WORKER_NAME (ajp13) -int JK_METHOD ajp13_worker_factory(jk_worker_t **w, - const char *name, jk_logger_t *l); +int JK_METHOD ajp13_worker_factory(jk_worker_t **w, + const char *name, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.h
mturk 2004/11/08 05:25:57
Modified:jk/native/common jk_ajp14.h
Log:
Format code
Revision ChangesPath
1.14 +72 -72jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h
Index: jk_ajp14.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_ajp14.h8 Oct 2004 07:50:40 - 1.13
+++ jk_ajp14.h8 Nov 2004 13:25:57 - 1.14
@@ -208,96 +208,96 @@
/*
* The login structure
*/
-typedef struct jk_login_service jk_login_service_t;
+typedef struct jk_login_service jk_login_service_t;
-struct jk_login_service
-{
+struct jk_login_service
+{
-/*
- * Pointer to web-server name
- */
-char *web_server_name;
-
-/*
- * Pointer to servlet-engine name
- */
-char *servlet_engine_name;
-
-/*
- * Pointer to secret key
- */
-char *secret_key;
-
-/*
- * Received entropy seed
- */
-char entropy[AJP14_ENTROPY_SEED_LEN + 1];
-
-/*
- * Computed key
- */
-char computed_key[AJP14_COMPUTED_KEY_LEN + 1];
-
-/*
- * What we want to negociate
- */
-unsigned long negociation;
-
-/*
- * What we received from servlet engine
- */
-unsigned long negociated;
-};
+/*
+ * Pointer to web-server name
+ */
+char *web_server_name;
+
+/*
+ * Pointer to servlet-engine name
+ */
+char *servlet_engine_name;
+
+/*
+ * Pointer to secret key
+ */
+char *secret_key;
+
+/*
+ * Received entropy seed
+ */
+char entropy[AJP14_ENTROPY_SEED_LEN + 1];
+
+/*
+ * Computed key
+ */
+char computed_key[AJP14_COMPUTED_KEY_LEN + 1];
+
+/*
+ * What we want to negociate
+ */
+unsigned long negociation;
+
+/*
+ * What we received from servlet engine
+ */
+unsigned long negociated;
+};
/*
* functions defined here
*/
-void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
+void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l);
-int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
-
-int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l);
-
-int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
+int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
+int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l);
-int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
+int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s,
- jk_logger_t *l);
+int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
+ jk_login_service_t *s, jk_logger_t *l);
-int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
+int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l);
-int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
- jk_msg_buf_t *unk,
- jk_logger_t *l);
+int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
+ jk_login_service_t *s,
+ jk_logger_t *l);
-int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
- char *virtual, jk_logger_t *l);
+int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l);
-int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
- jk_context_t *context, jk_logger_t *l);
+int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
+
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14_worker.h
mturk 2004/11/08 05:26:45 Modified:jk/native/common jk_ajp14_worker.h Log: Format code Revision ChangesPath 1.12 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.h Index: jk_ajp14_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_ajp14_worker.h 8 Oct 2004 07:50:40 - 1.11 +++ jk_ajp14_worker.h 8 Nov 2004 13:26:45 - 1.12 @@ -40,8 +40,8 @@ #define JK_AJP14_WORKER_NAME (ajp14) -int JK_METHOD ajp14_worker_factory(jk_worker_t **w, - const char *name, jk_logger_t *l); +int JK_METHOD ajp14_worker_factory(jk_worker_t **w, + const char *name, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.h
mturk 2004/11/08 05:27:52
Modified:jk/native/common jk_ajp_common.h
Log:
Format code
Revision ChangesPath
1.25 +114 -111
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
Index: jk_ajp_common.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_ajp_common.h 8 Oct 2004 07:50:40 - 1.24
+++ jk_ajp_common.h 8 Nov 2004 13:27:52 - 1.25
@@ -193,165 +193,168 @@
#define AJP_DEF_REPLY_TIMEOUT (0) /* NO REPLY TIMEOUT
*/
#define AJP_DEF_PREPOST_TIMEOUT (0) /* NO PREPOST TIMEOUT = NO
CPING/CPONG*/
#define AJP_DEF_RECOVERY_OPTS (0) /* NO RECOVERY / NO*/
+#define AJP_DEF_SOCKET_TIMEOUT(-1) /* No timeout */
#define RECOVER_ABORT_IF_TCGETREQUEST 0x0001 /* DONT RECOVER IF
TOMCAT FAIL AFTER RECEIVING REQUEST */
#define RECOVER_ABORT_IF_TCSENDHEADER0x0002 /* DONT RECOVER IF TOMCAT
FAIL AFTER SENDING HEADERS */
-struct jk_res_data
-{
-int status;
+struct jk_res_data
+{
+int status;
#ifdef AS400
-char *msg;
+char *msg;
#else
-const char *msg;
+const char *msg;
#endif
-unsigned num_headers;
-char **header_names;
-char **header_values;
-};
-typedef struct jk_res_data jk_res_data_t;
+unsigned num_headers;
+char **header_names;
+char **header_values;
+};
+typedef struct jk_res_data jk_res_data_t;
#include jk_ajp14.h
-struct ajp_operation;
-typedef struct ajp_operation ajp_operation_t;
+struct ajp_operation;
+typedef struct ajp_operation ajp_operation_t;
-struct ajp_endpoint;
-typedef struct ajp_endpoint ajp_endpoint_t;
+struct ajp_endpoint;
+typedef struct ajp_endpoint ajp_endpoint_t;
-struct ajp_worker;
-typedef struct ajp_worker ajp_worker_t;
+struct ajp_worker;
+typedef struct ajp_worker ajp_worker_t;
-struct ajp_worker
-{
-struct sockaddr_in worker_inet_addr;/* Contains host and port */
-unsigned connect_retry_attempts;
-char *name;
-
-/*
- * Open connections cache...
- *
- * 1. Critical section object to protect the cache.
- * 2. Cache size.
- * 3. An array of open endpoints.
- */
-JK_CRIT_SEC cs;
-unsigned ep_cache_sz;
-unsigned ep_mincache_sz;
-unsigned ep_maxcache_sz;
-ajp_endpoint_t **ep_cache;
-
-int proto; /* PROTOCOL USED AJP13/AJP14 */
-
-jk_login_service_t *login;
-
-/* Weak secret similar with ajp12, used in ajp13 */
-char *secret;
-
-jk_worker_t worker;
-
-/*
- * Post physical connect handler.
- * AJP14 will set here its login handler
- */
-int (*logon) (ajp_endpoint_t * ae, jk_logger_t *l);
-
-/*
- * Handle Socket Timeouts
- */
-unsigned socket_timeout;
-unsigned keepalive;
-/*
- * Handle Cache Timeouts
- */
-unsigned cache_timeout;
-
-/*
- * Handle Connection/Reply Timeouts
- */
-unsigned connect_timeout; /* connect cping/cpong delay in ms
(0 means disabled) */
-unsigned reply_timeout; /* reply timeout delay in ms (0 means
disabled) */
-unsigned prepost_timeout; /* before sending a request
cping/cpong timeout delay in ms (0 means disabled)*/
-
-/*
- * Recovery option
- */
-unsigned recovery_opts; /* Set the recovery option */
-};
+struct ajp_worker
+{
+struct sockaddr_in worker_inet_addr;/* Contains host and port */
+unsigned connect_retry_attempts;
+char *name;
+
+/*
+ * Open connections cache...
+ *
+ * 1. Critical section object to protect the cache.
+ * 2. Cache size.
+ * 3. An array of open endpoints.
+ */
+JK_CRIT_SEC cs;
+unsigned ep_cache_sz;
+unsigned ep_mincache_sz;
+unsigned ep_maxcache_sz;
+ajp_endpoint_t **ep_cache;
+
+int proto; /* PROTOCOL USED AJP13/AJP14 */
+
+jk_login_service_t *login;
+
+/* Weak secret similar with ajp12, used in ajp13 */
+char *secret;
+
+jk_worker_t worker;
+
+/*
+ * Post physical connect handler.
+ * AJP14 will set here its login handler
+ */
+int (*logon) (ajp_endpoint_t * ae, jk_logger_t *l);
+
+
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.h
mturk 2004/11/08 05:28:31
Modified:jk/native/common jk_connect.h
Log:
Add socket timout to open_socket
Revision ChangesPath
1.10 +11 -8 jakarta-tomcat-connectors/jk/native/common/jk_connect.h
Index: jk_connect.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_connect.h 8 Oct 2004 07:50:40 - 1.9
+++ jk_connect.h 8 Nov 2004 13:28:31 - 1.10
@@ -35,18 +35,21 @@
{
#endif /* __cplusplus */
-int jk_resolve(char *host, int port, struct sockaddr_in *rc);
+int jk_resolve(char *host, int port, struct sockaddr_in *rc);
-int jk_open_socket(struct sockaddr_in *addr,
- int ndelay, int keepalive, jk_logger_t *l);
+int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+ int keepalive, int timeout, jk_logger_t *l);
-int jk_close_socket(int s);
+int jk_close_socket(int s);
-int jk_tcp_socket_sendfull(int sd, const unsigned char *b, int len);
+int jk_tcp_socket_sendfull(int sd, const unsigned char *b, int len);
-int jk_tcp_socket_recvfull(int sd, unsigned char *b, int len);
+int jk_tcp_socket_recvfull(int sd, unsigned char *b, int len);
+
+char *jk_dump_hinfo(struct sockaddr_in *saddr, char *buf);
+
+int jk_socket_timeout_set(int sd, int timeout, int t);
-char *jk_dump_hinfo(struct sockaddr_in *saddr, char *buf);
#ifdef __cplusplus
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_context.h
mturk 2004/11/08 05:28:55
Modified:jk/native/common jk_context.h
Log:
Format code
Revision ChangesPath
1.9 +60 -60jakarta-tomcat-connectors/jk/native/common/jk_context.h
Index: jk_context.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_context.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_context.h 8 Oct 2004 07:50:40 - 1.8
+++ jk_context.h 8 Nov 2004 13:28:54 - 1.9
@@ -32,102 +32,102 @@
#define CBASE_INC_SIZE (8)/* Allocate memory by step of 8 URIs : ie 8
URI by context */
#define URI_INC_SIZE (8)/* Allocate memory by step of 8 CONTEXTs :
ie 8 contexts by worker */
-typedef struct
-{
+typedef struct
+{
-/*
- * Context base (ie examples)
- */
+/*
+ * Context base (ie examples)
+ */
-char *cbase;
+char *cbase;
-/*
- * Status (Up/Down)
- */
+/*
+ * Status (Up/Down)
+ */
-int status;
+int status;
-/*
- * Num of URI handled
- */
+/*
+ * Num of URI handled
+ */
-int size;
+int size;
-/*
- * Capacity
- */
+/*
+ * Capacity
+ */
-int capacity;
+int capacity;
-/*
- * URL/URIs (autoconf)
- */
+/*
+ * URL/URIs (autoconf)
+ */
-char **uris;
-}
-jk_context_item_t;
+char **uris;
+}
+jk_context_item_t;
-typedef struct
-{
+typedef struct
+{
-/*
- * Memory Pool
- */
+/*
+ * Memory Pool
+ */
-jk_pool_t p;
-jk_pool_atom_t buf[SMALL_POOL_SIZE];
+jk_pool_t p;
+jk_pool_atom_t buf[SMALL_POOL_SIZE];
-/*
- * Virtual Server (if use)
- */
+/*
+ * Virtual Server (if use)
+ */
-char *virtual;
+char *virtual;
-/*
- * Num of context handled (ie: examples, admin...)
- */
+/*
+ * Num of context handled (ie: examples, admin...)
+ */
-int size;
+int size;
-/*
- * Capacity
- */
+/*
+ * Capacity
+ */
-int capacity;
+int capacity;
-/*
- * Context list, context / URIs
- */
+/*
+ * Context list, context / URIs
+ */
-jk_context_item_t **contexts;
-}
-jk_context_t;
+jk_context_item_t **contexts;
+}
+jk_context_t;
/*
* functions defined here
*/
-int context_set_virtual(jk_context_t *c, char *virtual);
+int context_set_virtual(jk_context_t *c, char *virtual);
-int context_open(jk_context_t *c, char *virtual);
+int context_open(jk_context_t *c, char *virtual);
-int context_close(jk_context_t *c);
+int context_close(jk_context_t *c);
-int context_alloc(jk_context_t **c, char *virtual);
+int context_alloc(jk_context_t **c, char *virtual);
-int context_free(jk_context_t **c);
+int context_free(jk_context_t **c);
-jk_context_item_t *context_find_base(jk_context_t *c, char *cbase);
+jk_context_item_t *context_find_base(jk_context_t *c, char *cbase);
-char *context_item_find_uri(jk_context_item_t *ci, char *uri);
+char *context_item_find_uri(jk_context_item_t *ci, char *uri);
-void context_dump_uris(jk_context_t *c, char *cbase, FILE * f);
+void context_dump_uris(jk_context_t *c, char *cbase, FILE * f);
-jk_context_item_t *context_add_base(jk_context_t *c, char *cbase);
+jk_context_item_t *context_add_base(jk_context_t *c, char *cbase);
-int context_add_uri(jk_context_t *c, char *cbase, char *uri);
+int context_add_uri(jk_context_t *c, char *cbase, char *uri);
#ifdef __cplusplus
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
mturk 2004/11/08 05:29:27 Modified:jk/native/common jk_global.h Log: Add needed includes for unix Revision ChangesPath 1.35 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- jk_global.h 8 Oct 2004 07:50:40 - 1.34 +++ jk_global.h 8 Nov 2004 13:29:27 - 1.35 @@ -78,6 +78,7 @@ #include netinet/tcp.h #include arpa/inet.h #include sys/un.h +#include fcntl.h #if !defined(_OSD_POSIX) !defined(AS400) !defined(CYGWIN) #include sys/socketvar.h #endif - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.h
mturk 2004/11/08 05:29:52 Modified:jk/native/common jk_jni_worker.h Log: Format code Revision ChangesPath 1.8 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.h Index: jk_jni_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_jni_worker.h 8 Oct 2004 07:50:40 - 1.7 +++ jk_jni_worker.h 8 Nov 2004 13:29:52 - 1.8 @@ -33,8 +33,8 @@ #define JK_JNI_WORKER_NAME (jni) -int JK_METHOD jni_worker_factory(jk_worker_t **w, - const char *name, jk_logger_t *l); +int JK_METHOD jni_worker_factory(jk_worker_t **w, + const char *name, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.h
mturk 2004/11/08 05:30:15 Modified:jk/native/common jk_lb_worker.h Log: Format code Revision ChangesPath 1.8 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.h Index: jk_lb_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_lb_worker.h8 Oct 2004 07:50:40 - 1.7 +++ jk_lb_worker.h8 Nov 2004 13:30:14 - 1.8 @@ -33,8 +33,8 @@ #define JK_LB_WORKER_NAME (lb) -int JK_METHOD lb_worker_factory(jk_worker_t **w, -const char *name, jk_logger_t *l); +int JK_METHOD lb_worker_factory(jk_worker_t **w, +const char *name, jk_logger_t *l); #ifdef __cplusplus } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_logger.h
mturk 2004/11/08 05:30:41
Modified:jk/native/common jk_logger.h
Log:
Format code
Revision ChangesPath
1.9 +18 -18jakarta-tomcat-connectors/jk/native/common/jk_logger.h
Index: jk_logger.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_logger.h 8 Oct 2004 07:50:40 - 1.8
+++ jk_logger.h 8 Nov 2004 13:30:41 - 1.9
@@ -30,23 +30,23 @@
{
#endif /* __cplusplus */
-typedef struct jk_logger jk_logger_t;
-struct jk_logger
-{
-void *logger_private;
-int level;
+typedef struct jk_logger jk_logger_t;
+struct jk_logger
+{
+void *logger_private;
+int level;
-int (JK_METHOD * log) (jk_logger_t *l, int level, const char *what);
+int (JK_METHOD * log) (jk_logger_t *l, int level, const char *what);
-};
+};
-struct file_logger
-{
-FILE *logfile;
-/* For Apache 2 APR piped logging */
-void *jklogfp;
-};
-typedef struct file_logger file_logger_t;
+struct file_logger
+{
+FILE *logfile;
+/* For Apache 2 APR piped logging */
+void *jklogfp;
+};
+typedef struct file_logger file_logger_t;
#define JK_LOG_DEBUG_LEVEL 0
#define JK_LOG_INFO_LEVEL1
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.h
mturk 2004/11/08 05:31:05 Modified:jk/native/common jk_map.h Log: Format code Revision ChangesPath 1.11 +21 -19jakarta-tomcat-connectors/jk/native/common/jk_map.h Index: jk_map.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_map.h 5 Nov 2004 15:28:39 - 1.10 +++ jk_map.h 8 Nov 2004 13:31:05 - 1.11 @@ -30,44 +30,46 @@ #endif /* __cplusplus */ -struct jk_map; -typedef struct jk_map jk_map_t; +struct jk_map; +typedef struct jk_map jk_map_t; -int map_alloc(jk_map_t **m); +int map_alloc(jk_map_t **m); -int jk_map_free(jk_map_t **m); +int map_free(jk_map_t **m); -int map_open(jk_map_t *m); +int map_open(jk_map_t *m); -int map_close(jk_map_t *m); +int map_close(jk_map_t *m); -void *map_get(jk_map_t *m, const char *name, const void *def); +void *map_get(jk_map_t *m, const char *name, const void *def); -int map_get_int(jk_map_t *m, const char *name, int def); +int map_get_int(jk_map_t *m, const char *name, int def); -double map_get_double(jk_map_t *m, const char *name, double def); +double map_get_double(jk_map_t *m, const char *name, double def); -char *map_get_string(jk_map_t *m, const char *name, const char *def); +char *map_get_string(jk_map_t *m, const char *name, const char *def); -char **map_get_string_list(jk_map_t *m, - const char *name, - unsigned *list_len, const char *def); +char **map_get_string_list(jk_map_t *m, + const char *name, + unsigned *list_len, const char *def); -int map_put(jk_map_t *m, const char *name, const void *value, void **old); +int map_put(jk_map_t *m, const char *name, const void *value, void **old); -int map_read_properties(jk_map_t *m, const char *f); +int map_read_property(jk_map_t *m, const char *str); -int map_size(jk_map_t *m); +int map_read_properties(jk_map_t *m, const char *f); -char *map_name_at(jk_map_t *m, int idex); +int map_size(jk_map_t *m); -void *map_value_at(jk_map_t *m, int idex); +char *map_name_at(jk_map_t *m, int idex); + +void *map_value_at(jk_map_t *m, int idex); /** * Replace $(property) in value. * */ -char *map_replace_properties(const char *value, jk_map_t *m); +char *map_replace_properties(const char *value, jk_map_t *m); #ifdef __cplusplus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.h
mturk 2004/11/08 05:31:55
Modified:jk/native/common jk_md5.h
Log:
Use platform 32 bit integers
Revision ChangesPath
1.5 +10 -14jakarta-tomcat-connectors/jk/native/common/jk_md5.h
Index: jk_md5.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_md5.h 8 Oct 2004 07:50:40 - 1.4
+++ jk_md5.h 8 Nov 2004 13:31:55 - 1.5
@@ -57,23 +57,19 @@
#define JK_MD5_DIGESTSIZE 16
/* JK_UINT4 defines a four byte word */
-#if HAVE_APR
-typedef apr_uint32_t JK_UINT4;
-#else
#ifdef WIN32
typedef DWORD JK_UINT4;
#else
-typedef unsigned int JK_UINT4;
+typedef uint32_t JK_UINT4;
#endif
-#endif /* HAVE_APR */
/* MD5 context. */
-typedef struct
-{
-JK_UINT4 state[4]; /* state (ABCD) */
-JK_UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
-unsigned char buffer[64]; /* input buffer */
-} JK_MD5_CTX;
+typedef struct
+{
+JK_UINT4 state[4]; /* state (ABCD) */
+JK_UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
+unsigned char buffer[64]; /* input buffer */
+} JK_MD5_CTX;
/*
* Define the Magic String prefix that identifies a password as being
@@ -82,9 +78,9 @@
#define JK_MD5PW_ID $apr1$
#define JK_MD5PW_IDLEN 6
-char *JK_METHOD jk_hextocstr(unsigned char *org, char *dst, int n);
-char *JK_METHOD jk_md5(const unsigned char *org,
- const unsigned char *org2, char *dst);
+char *JK_METHOD jk_hextocstr(unsigned char *org, char *dst, int n);
+char *JK_METHOD jk_md5(const unsigned char *org,
+ const unsigned char *org2, char *dst);
#ifdef __cplusplus
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.h
mturk 2004/11/08 05:32:21 Modified:jk/native/common jk_msg_buff.h Log: Format code Revision ChangesPath 1.12 +36 -37jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.h Index: jk_msg_buff.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_msg_buff.h 8 Oct 2004 07:50:40 - 1.11 +++ jk_msg_buff.h 8 Nov 2004 13:32:21 - 1.12 @@ -47,124 +47,123 @@ */ -typedef struct jk_msg_buf_t jk_msg_buf_t; +typedef struct jk_msg_buf_t jk_msg_buf_t; /* Setup routines */ /** Allocate a buffer. */ -jk_msg_buf_t *jk_b_new(jk_pool_t *p); +jk_msg_buf_t *jk_b_new(jk_pool_t *p); /** Set up a buffer with an existing buffer */ -int jk_b_set_buffer(jk_msg_buf_t *msg, unsigned char *data, int buffSize); +int jk_b_set_buffer(jk_msg_buf_t *msg, unsigned char *data, int buffSize); /* * Set up a buffer with a new buffer of buffSize */ -int jk_b_set_buffer_size(jk_msg_buf_t *msg, int buffSize); +int jk_b_set_buffer_size(jk_msg_buf_t *msg, int buffSize); /* * Finalize the buffer before sending - set length fields, etc */ -void jk_b_end(jk_msg_buf_t *msg, int protoh); +void jk_b_end(jk_msg_buf_t *msg, int protoh); /* * Recycle the buffer - z for a new invocation */ -void jk_b_reset(jk_msg_buf_t *msg); +void jk_b_reset(jk_msg_buf_t *msg); /* * Return the buffer body */ -unsigned char *jk_b_get_buff(jk_msg_buf_t *msg); +unsigned char *jk_b_get_buff(jk_msg_buf_t *msg); /* * Return the current reading position */ -unsigned int jk_b_get_pos(jk_msg_buf_t *msg); +unsigned int jk_b_get_pos(jk_msg_buf_t *msg); /* * Buffer size */ -int jk_b_get_size(jk_msg_buf_t *msg); +int jk_b_get_size(jk_msg_buf_t *msg); -void jk_b_set_len(jk_msg_buf_t *msg, int len); +void jk_b_set_len(jk_msg_buf_t *msg, int len); -void jk_b_set_pos(jk_msg_buf_t *msg, int pos); +void jk_b_set_pos(jk_msg_buf_t *msg, int pos); /* * Get the message length for incomming buffers * or the current length for outgoing */ -unsigned int jk_b_get_len(jk_msg_buf_t *msg); +unsigned int jk_b_get_len(jk_msg_buf_t *msg); /* Real encoding */ -int jk_b_append_byte(jk_msg_buf_t *msg, unsigned char val); +int jk_b_append_byte(jk_msg_buf_t *msg, unsigned char val); -int jk_b_append_bytes(jk_msg_buf_t *msg, - const unsigned char *param, int len); +int jk_b_append_bytes(jk_msg_buf_t *msg, + const unsigned char *param, int len); -int jk_b_append_int(jk_msg_buf_t *msg, unsigned short val); +int jk_b_append_int(jk_msg_buf_t *msg, unsigned short val); -int jk_b_append_long(jk_msg_buf_t *msg, unsigned long val); +int jk_b_append_long(jk_msg_buf_t *msg, unsigned long val); -int jk_b_append_string(jk_msg_buf_t *msg, const char *param); +int jk_b_append_string(jk_msg_buf_t *msg, const char *param); #ifdef AS400 -int jk_b_append_asciistring(jk_msg_buf_t *msg, const char *param); +int jk_b_append_asciistring(jk_msg_buf_t *msg, const char *param); #endif -int jk_b_append_bytes(jk_msg_buf_t *msg, - const unsigned char *param, int len); +int jk_b_append_bytes(jk_msg_buf_t *msg, + const unsigned char *param, int len); /* Decoding */ /** Get a byte from the current position */ -unsigned char jk_b_get_byte(jk_msg_buf_t *msg); +unsigned char jk_b_get_byte(jk_msg_buf_t *msg); /** Get an int from the current position */ -unsigned short jk_b_get_int(jk_msg_buf_t *msg); +unsigned short jk_b_get_int(jk_msg_buf_t *msg); /** Get a long from the current position */ -unsigned long jk_b_get_long(jk_msg_buf_t *msg); +unsigned long jk_b_get_long(jk_msg_buf_t *msg); /** Get a String from the current position */ -unsigned char *jk_b_get_string(jk_msg_buf_t *msg); +unsigned char *jk_b_get_string(jk_msg_buf_t *msg); /** Get Bytes from the current position */ -int jk_b_get_bytes(jk_msg_buf_t *msg, unsigned char *buf, int len); +int jk_b_get_bytes(jk_msg_buf_t *msg, unsigned char *buf, int len); /** Get a byte from an arbitrary position */ -unsigned char jk_b_pget_byte(jk_msg_buf_t *msg, int pos); +unsigned char jk_b_pget_byte(jk_msg_buf_t *msg, int pos); /** Get an int from an arbitrary position */ -unsigned short jk_b_pget_int(jk_msg_buf_t *msg, int pos);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.h
mturk 2004/11/08 05:32:56
Modified:jk/native/common jk_pool.h
Log:
Format code
Revision ChangesPath
1.9 +17 -18jakarta-tomcat-connectors/jk/native/common/jk_pool.h
Index: jk_pool.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_pool.h 8 Oct 2004 07:50:40 - 1.8
+++ jk_pool.h 8 Nov 2004 13:32:56 - 1.9
@@ -95,31 +95,30 @@
typedef struct jk_pool_t jk_pool_t;
/** jk pool structure */
-struct jk_pool_t
-{
-size_t size;
-size_t pos;
-char *buf;
-size_t dyn_size;
-size_t dyn_pos;
-void **dynamic;
-};
+struct jk_pool_t
+{
+size_t size;
+size_t pos;
+char *buf;
+size_t dyn_size;
+size_t dyn_pos;
+void **dynamic;
+};
-void jk_open_pool(jk_pool_t *p, jk_pool_atom_t *buf, size_t size);
+void jk_open_pool(jk_pool_t *p, jk_pool_atom_t *buf, size_t size);
-void jk_close_pool(jk_pool_t *p);
+void jk_close_pool(jk_pool_t *p);
-void jk_reset_pool(jk_pool_t *p);
+void jk_reset_pool(jk_pool_t *p);
-void *jk_pool_alloc(jk_pool_t *p, size_t sz);
+void *jk_pool_alloc(jk_pool_t *p, size_t sz);
-void *jk_pool_realloc(jk_pool_t *p,
- size_t sz, const void *old, size_t old_sz);
+void *jk_pool_realloc(jk_pool_t *p,
+ size_t sz, const void *old, size_t old_sz);
-void *jk_pool_strdup(jk_pool_t *p, const char *s);
+void *jk_pool_strdup(jk_pool_t *p, const char *s);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
#endif /* _JK_POOL_H */
-
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_uri_worker_map.h
mturk 2004/11/08 05:33:55 Modified:jk/native/common jk_uri_worker_map.h Log: Format code Revision ChangesPath 1.11 +16 -17 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.h Index: jk_uri_worker_map.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_uri_worker_map.h 8 Oct 2004 07:50:40 - 1.10 +++ jk_uri_worker_map.h 8 Nov 2004 13:33:55 - 1.11 @@ -33,29 +33,28 @@ #include jk_map.h #include jk_logger.h -struct jk_uri_worker_map; -typedef struct jk_uri_worker_map jk_uri_worker_map_t; +struct jk_uri_worker_map; +typedef struct jk_uri_worker_map jk_uri_worker_map_t; -int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map, - jk_map_t *init_data, jk_logger_t *l); +int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map, + jk_map_t *init_data, jk_logger_t *l); -int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_logger_t *l); +int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_logger_t *l); -int uri_worker_map_open(jk_uri_worker_map_t *uw_map, -jk_map_t *init_data, jk_logger_t *l); +int uri_worker_map_open(jk_uri_worker_map_t *uw_map, +jk_map_t *init_data, jk_logger_t *l); -int uri_worker_map_add(jk_uri_worker_map_t *uw_map, - char *puri, char *pworker, jk_logger_t *l); +int uri_worker_map_add(jk_uri_worker_map_t *uw_map, + char *puri, char *pworker, jk_logger_t *l); -int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_logger_t *l); +int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_logger_t *l); -void jk_no2slash(char *name); +void jk_no2slash(char *name); -char *map_uri_to_worker(jk_uri_worker_map_t *uw_map, -char *uri, jk_logger_t *l); +char *map_uri_to_worker(jk_uri_worker_map_t *uw_map, +char *uri, jk_logger_t *l); #ifdef __cplusplus } -#endif /* __cplusplus */ - -#endif /* JK_URI_WORKER_MAP_H */ +#endif/* __cplusplus */ +#endif/* JK_URI_WORKER_MAP_H */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.h
mturk 2004/11/08 05:34:11 Modified:jk/native/common jk_util.h Log: Format code Revision ChangesPath 1.18 +4 -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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_util.h 8 Oct 2004 07:50:40 - 1.17 +++ jk_util.h 8 Nov 2004 13:34:11 - 1.18 @@ -67,13 +67,15 @@ int jk_get_worker_prepost_timeout(jk_map_t *m, const char *wname, int def); +int jk_get_worker_recycle_timeout(jk_map_t *m, const char *wname, int def); + char *jk_get_worker_secret_key(jk_map_t *m, const char *wname); void jk_set_log_format(const char *logformat); int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_wokers); -double jk_get_lb_factor(jk_map_t *m, const char *wname); +int jk_get_lb_factor(jk_map_t *m, const char *wname); int jk_get_is_sticky_session(jk_map_t *m, const char *wname); @@ -140,5 +142,4 @@ #ifdef __cplusplus } #endif /* __cplusplus */ - #endif /* _JK_UTIL_H */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.h
mturk 2004/11/08 05:34:37
Modified:jk/native/common jk_worker.h
Log:
Format code
Revision ChangesPath
1.11 +8 -9 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_worker.h 8 Oct 2004 07:50:40 - 1.10
+++ jk_worker.h 8 Nov 2004 13:34:37 - 1.11
@@ -33,20 +33,19 @@
{
#endif /* __cplusplus */
-int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l);
+int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l);
-void wc_close(jk_logger_t *l);
+void wc_close(jk_logger_t *l);
-jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l);
+jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l);
-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);
+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);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
#endif /* JK_WORKER_H */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mturk 2004/11/08 05:37:46
Modified:jk/native/common jk_ajp_common.c
Log:
Use socket timeout and recycle timeout.
Revision ChangesPath
1.60 +21 -13
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jk_ajp_common.c 8 Oct 2004 07:50:39 - 1.59
+++ jk_ajp_common.c 8 Nov 2004 13:37:46 - 1.60
@@ -728,7 +728,8 @@
for (attempt = 0; attempt ae-worker-connect_retry_attempts;
attempt++) {
ae-sd = jk_open_socket(ae-worker-worker_inet_addr, JK_TRUE,
-ae-worker-keepalive, l);
+ae-worker-keepalive,
+ae-worker-socket_timeout, l);
if (ae-sd = 0) {
jk_log(l, JK_LOG_DEBUG,
In jk_endpoint_t::ajp_connect_to_endpoint,
@@ -742,7 +743,7 @@
return (ae-worker-logon(ae, l));
/* should we send a CPING to validate connection ? */
-if (ae-worker-connect_timeout != 0)
+if (ae-worker-connect_timeout 0)
return (ajp_handle_cping_cpong
(ae, ae-worker-connect_timeout, l));
@@ -1483,9 +1484,9 @@
without recovery in send loop %d\n, i);
return JK_FALSE;
}
-jk_log(l, JK_LOG_ERROR,
- ERROR: Receiving from tomcat failed,
- recoverable operation. err=%d\n, i);
+jk_log(l, JK_LOG_INFO,
+ Receiving from tomcat failed,
+ recoverable operation attempt=%d\n, i);
}
}
@@ -1604,7 +1605,7 @@
ajp_worker_t *p = pThis-worker_private;
int cache_sz = jk_get_worker_cache_size(props, p-name, cache);
p-socket_timeout =
-jk_get_worker_socket_timeout(props, p-name, AJP13_DEF_TIMEOUT);
+jk_get_worker_socket_timeout(props, p-name,
AJP_DEF_SOCKET_TIMEOUT);
jk_log(l, JK_LOG_DEBUG,
In jk_worker_t::init, setting socket timeout to %d\n,
@@ -1617,6 +1618,13 @@
In jk_worker_t::init, setting socket keepalive to %d\n,
p-keepalive);
+p-recycle_timeout =
+jk_get_worker_recycle_timeout(props, p-name, AJP13_DEF_TIMEOUT);
+
+jk_log(l, JK_LOG_DEBUG,
+ In jk_worker_t::init, setting connection recycle timeout to
%d\n,
+ p-recycle_timeout);
+
p-cache_timeout =
jk_get_worker_cache_timeout(props, p-name,
AJP_DEF_CACHE_TIMEOUT);
@@ -1797,8 +1805,8 @@
if (aw-cache_timeout) {
for (; i aw-ep_cache_sz; i++) {
if (aw-ep_cache[i]) {
-unsigned elapsed =
-(unsigned)(now - ae-last_access);
+int elapsed =
+(int)(now - ae-last_access);
if (elapsed aw-cache_timeout) {
jk_log(l, JK_LOG_DEBUG,
In jk_endpoint_t::ajp_get_endpoint,
@@ -1814,18 +1822,18 @@
if (ae) {
if (ae-sd 0) {
/* Handle timeouts for open sockets */
-unsigned elapsed = (unsigned)(now - ae-last_access);
+int elapsed = (int)(now - ae-last_access);
ae-last_access = now;
jk_log(l, JK_LOG_DEBUG,
In jk_endpoint_t::ajp_get_endpoint,
time elapsed since last request = %u
seconds\n,
elapsed);
-if (aw-socket_timeout 0
-elapsed aw-socket_timeout) {
+if (aw-recycle_timeout 0
+elapsed aw-recycle_timeout) {
jk_close_socket(ae-sd);
jk_log(l, JK_LOG_DEBUG,
In jk_endpoint_t::ajp_get_endpoint,
- reached socket timeout, closed sd =
%d\n,
+ reached connection recycle timeout,
closed sd = %d\n,
ae-sd);
ae-sd = -1;/* just to avoid twice close
*/
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mturk 2004/11/08 05:39:27
Modified:jk/native/common jk_connect.c
Log:
Use socket timeout, and use read/write on unix platforms.
Use macros for WIN32/Netware socket errors.
Revision ChangesPath
1.28 +204 -56 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_connect.c 8 Oct 2004 07:50:39 - 1.27
+++ jk_connect.c 8 Nov 2004 13:39:27 - 1.28
@@ -21,6 +21,7 @@
/**
* @package jk_connect
* @author Gal Shachor [EMAIL PROTECTED]
+ * @author Mladen Turk [EMAIL PROTECTED]
* @version $Revision$
*/
@@ -38,6 +39,14 @@
typedef u_long in_addr_t;
#endif
+#if defined(WIN32) || (defined(NETWARE) defined(__NOVELL_LIBC__))
+#define JK_IS_SOCKET_ERROR(x) ((x) == SOCKET_ERROR)
+#define JK_GET_SOCKET_ERRNO() errno = WSAGetLastError() - WSABASEERR
+#else
+#define JK_IS_SOCKET_ERROR(x) ((x) == -1)
+#define JK_GET_SOCKET_ERRNO() ((void)0)
+#endif /* WIN32 */
+
/** resolve the host IP */
@@ -125,8 +134,8 @@
/** connect to Tomcat */
-int jk_open_socket(struct sockaddr_in *addr,
- int ndelay, int keepalive, jk_logger_t *l)
+int jk_open_socket(struct sockaddr_in *addr, int ndelay,
+ int keepalive, int timeout, jk_logger_t *l)
{
char buf[32];
int sock;
@@ -134,8 +143,23 @@
jk_log(l, JK_LOG_DEBUG, Into jk_open_socket\n);
sock = socket(AF_INET, SOCK_STREAM, 0);
-if (sock -1) {
-int ret;
+if (sock = 0) {
+int ret, len;
+if (timeout != -1) {
+ret = jk_socket_timeout_set(sock, -1, timeout);
+if (ret) {
+jk_close_socket(sock);
+jk_log(l, JK_LOG_INFO,
+ jk_open_socket, timeout_set failed errno = %d\n,
+ ret);
+return -1;
+}
+jk_log(l, JK_LOG_DEBUG,
+jk_open_socket, set timeout to %d with status %d\n,
+timeout, ret);
+
+}
+
/* Tries to connect to Tomcat (continues trying while error is
EINTR) */
do {
jk_log(l, JK_LOG_DEBUG,
@@ -149,7 +173,7 @@
#endif
ret = connect(sock,
(struct sockaddr *)addr,
- sizeof(struct sockaddr_in));
+ sizeof(struct sockaddr_in));
#if defined(WIN32) || (defined(NETWARE) defined(__NOVELL_LIBC__))
if (SOCKET_ERROR == ret) {
errno = WSAGetLastError() - WSABASEERR;
@@ -160,41 +184,57 @@
} while (-1 == ret EINTR == errno);
/* Check if we connected */
-if (0 == ret) {
+if (ret == -1) {
+jk_log(l, JK_LOG_INFO,
+ jk_open_socket, connect() failed errno = %d\n, errno);
+jk_close_socket(sock);
+return -1;
+}
+if (ndelay) {
+int set = 1;
+jk_log(l, JK_LOG_DEBUG,
+ jk_open_socket, set TCP_NODELAY to on\n);
+setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)set,
+ sizeof(set));
+}
+if (keepalive) {
int keep = 1;
-if (ndelay) {
-int set = 1;
-
-jk_log(l, JK_LOG_DEBUG,
- jk_open_socket, set TCP_NODELAY to on\n);
-setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)set,
- sizeof(set));
-}
+jk_log(l, JK_LOG_DEBUG,
+jk_open_socket, set SO_KEEPALIVE to on\n);
+setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *)keep,
+sizeof(keep));
+}
+len = 8*1024; /* Default AJP packet size */
-if (keepalive) {
-jk_log(l, JK_LOG_DEBUG,
- jk_open_socket, set SO_KEEPALIVE to on\n);
-setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char *)keep,
- sizeof(keep));
-}
+/* Set socket send buffer size */
+if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)len,
+ sizeof(len))) {
+JK_GET_SOCKET_ERRNO();
+jk_log(l, JK_LOG_ERROR,
+ ERROR: jk_open_socket, failed setting sndbuf errno =
%d\n, errno);
+jk_close_socket(sock);
+return -1;
+}
+/* Set socket receive buffer size */
+if (setsockopt(sock,
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2004/11/08 05:42:23
Modified:jk/native/common jk_lb_worker.c
Log:
Backport load balancer algorithm from proxy_balancer.
Use integer balancer factors instead double.
This algorithim is much fatster and it actually behaves like
it should.
Revision ChangesPath
1.25 +21 -41jakarta-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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_lb_worker.c8 Oct 2004 07:50:39 - 1.24
+++ jk_lb_worker.c8 Nov 2004 13:42:23 - 1.25
@@ -18,8 +18,9 @@
* Description: Load balancer worker, knows how to load balance among *
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
+ * Author: Mladen Turk [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision$ *
+ * Version: $Revision$ *
***/
#include jk_pool.h
@@ -39,11 +40,17 @@
#define WAIT_BEFORE_RECOVER (60*1)
#define ADDITINAL_WAIT_LOAD (20)
+/**
+ * Worker record should be inside shared
+ * memory for correct behavior.
+ * Right now it operates on 'equal-load'
+ * presumption.
+ */
struct worker_record
{
char *name;
-double lb_factor;
-double lb_value;
+int lb_factor;
+int lb_value;
int is_local_worker;
int in_error_state;
int in_recovering;
@@ -98,7 +105,7 @@
* to be on the safe side lets remove the trailing query
* string if appended...
*/
-if (id_end = strchr(id_start, '?')) {
+if ((id_end = strchr(id_start, '?')) != NULL) {
*id_end = '\0';
}
/*
@@ -189,31 +196,14 @@
}
}
-static double get_max_lb(lb_worker_t * p)
-{
-unsigned i;
-double rc = 0.0;
-
-for (i = 0; i p-num_of_workers; i++) {
-if (!p-lb_workers[i].in_error_state) {
-if (p-lb_workers[i].lb_value rc) {
-rc = p-lb_workers[i].lb_value;
-}
-}
-}
-
-return rc;
-
-}
-
static worker_record_t *get_most_suitable_worker(lb_worker_t * p,
jk_ws_service_t *s,
int attempt)
{
worker_record_t *rc = NULL;
-double lb_min = 0.0;
unsigned i;
char *sessionid = NULL;
+int total_factor = 0;
if (p-sticky_session) {
sessionid = get_sessionid(s);
@@ -264,20 +254,19 @@
}
}
else {
-if (p-lb_workers[i].lb_value lb_min || !rc) {
-lb_min = p-lb_workers[i].lb_value;
+p-lb_workers[i].lb_value += p-lb_workers[i].lb_factor;
+total_factor += p-lb_workers[i].lb_factor;
+if (!rc || p-lb_workers[i].lb_value rc-lb_value)
rc = (p-lb_workers[i]);
-if (rc-is_local_worker)
-break;
-}
}
}
}
-if (rc !rc-is_local_worker) {
-rc-lb_value += rc-lb_factor;
+if (rc) {
+rc-lb_value -= total_factor;
}
+
return rc;
}
@@ -316,7 +305,7 @@
rc = rec-w-get_endpoint(rec-w, end, l);
-jk_log(l, JK_LOG_DEBUG,
+jk_log(l, JK_LOG_INFO,
Into jk_endpoint_t::service worker=%s jvm_route=%s
rc=%d\n,
rec-name, s-jvm_route, rc);
@@ -324,10 +313,6 @@
int src = end-service(end, s, l, is_recoverable);
end-done(end, l);
if (src) {
-if (rec-in_recovering rec-lb_value != 0) {
-rec-lb_value =
-get_max_lb(p-worker) + ADDITINAL_WAIT_LOAD;
-}
rec-in_error_state = JK_FALSE;
rec-in_recovering = JK_FALSE;
rec-error_time = 0;
@@ -431,13 +416,8 @@
jk_pool_strdup(p-p, worker_names[i]);
p-lb_workers[i].lb_factor =
jk_get_lb_factor(props, worker_names[i]);
-
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c
mturk 2004/11/08 05:45:06
Modified:jk/native/common jk_map.c
Log:
Split map_read_properties to two functions. This will enable
adding JkProperty to apache conf, to enable workers.properties
configuration inside httpd.conf.
Revision ChangesPath
1.16 +75 -50jakarta-tomcat-connectors/jk/native/common/jk_map.c
Index: jk_map.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_map.c 5 Nov 2004 15:28:39 - 1.15
+++ jk_map.c 8 Nov 2004 13:45:06 - 1.16
@@ -17,6 +17,7 @@
/***
* Description: General purpose map object *
* Author: Gal Shachor [EMAIL PROTECTED] *
+ * Author: Mladen Turk [EMAIL PROTECTED] *
* Version: $Revision$ *
***/
#ifdef AS400
@@ -45,7 +46,7 @@
};
static void trim_prp_comment(char *prp);
-static int trim(char *s);
+static size_t trim(char *s);
static int map_realloc(jk_map_t *m);
int map_alloc(jk_map_t **m)
@@ -57,7 +58,7 @@
return JK_FALSE;
}
-int jk_map_free(jk_map_t **m)
+int map_free(jk_map_t **m)
{
int rc = JK_FALSE;
@@ -119,7 +120,7 @@
{
char buf[100];
char *rc;
-int len;
+size_t len;
int int_res;
int multit = 1;
@@ -245,6 +246,58 @@
return rc;
}
+int map_read_property(jk_map_t *m, const char *str)
+{
+int rc = JK_TRUE;
+char buf[LENGTH_OF_LINE + 1];
+char *prp = buf[0];
+
+if (strlen(str) LENGTH_OF_LINE)
+return JK_FALSE;
+
+strcpy(prp, str);
+if (trim(prp)) {
+char *v = strchr(prp, '=');
+if (v) {
+*v = '\0';
+v++;
+if (strlen(v) strlen(prp)) {
+char *oldv = map_get_string(m, prp, NULL);
+v = map_replace_properties(v, m);
+if (oldv) {
+char *tmpv = jk_pool_alloc(m-p,
+strlen(v) +
+strlen(oldv) + 3);
+if (tmpv) {
+char sep = '*';
+if (jk_is_path_poperty(prp)) {
+sep = PATH_SEPERATOR;
+}
+else if (jk_is_cmd_line_poperty(prp)) {
+sep = ' ';
+}
+
+sprintf(tmpv, %s%c%s, oldv, sep, v);
+}
+v = tmpv;
+}
+else {
+v = jk_pool_strdup(m-p, v);
+}
+if (v) {
+void *old = NULL;
+map_put(m, prp, v, old);
+}
+else {
+rc = JK_FALSE;
+}
+}
+}
+}
+return rc;
+}
+
+
int map_read_properties(jk_map_t *m, const char *f)
{
int rc = JK_FALSE;
@@ -264,47 +317,9 @@
while (NULL != (prp = fgets(buf, LENGTH_OF_LINE, fp))) {
trim_prp_comment(prp);
-if (trim(prp)) {
-char *v = strchr(prp, '=');
-if (v) {
-*v = '\0';
-v++;
-if (strlen(v) strlen(prp)) {
-char *oldv = map_get_string(m, prp, NULL);
-v = map_replace_properties(v, m);
-if (oldv) {
-char *tmpv = jk_pool_alloc(m-p,
- strlen(v) +
- strlen(oldv) + 3);
-if (tmpv) {
-char sep = '*';
-if (jk_is_path_poperty(prp)) {
-sep = PATH_SEPERATOR;
-}
-else if (jk_is_cmd_line_poperty(prp)) {
-sep = ' ';
-}
-
-sprintf(tmpv, %s%c%s, oldv, sep, v);
-}
-v = tmpv;
-}
-else {
-v = jk_pool_strdup(m-p, v);
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/08 05:48:12
Modified:jk/native/common jk_util.c
Log:
Add recycle_timeout instead socket_timeout
Revision ChangesPath
1.32 +21 -8 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_util.c 5 Nov 2004 15:28:39 - 1.31
+++ jk_util.c 8 Nov 2004 13:48:11 - 1.32
@@ -50,6 +50,7 @@
#define REPLY_TIMEOUT_OF_WORKER (reply_timeout)
#define SOCKET_TIMEOUT_OF_WORKER(socket_timeout)
#define SOCKET_KEEPALIVE_OF_WORKER (socket_keepalive)
+#define RECYCLE_TIMEOUT_OF_WORKER (recycle_timeout)
#define LOAD_FACTOR_OF_WORKER (lbfactor)
#define BALANCED_WORKERS(balanced_workers)
#define STICKY_SESSION (sticky_session)
@@ -61,7 +62,7 @@
#define DEFAULT_WORKER JK_AJP12_WORKER_NAME
#define WORKER_LIST_PROPERTY_NAME (worker.list)
-#define DEFAULT_LB_FACTOR (1.0)
+#define DEFAULT_LB_FACTOR (1)
#define LOG_FORMAT (log_format)
#define TOMCAT32_BRIDGE_NAME(tomcat32)
@@ -205,11 +206,9 @@
{
if (l *l) {
file_logger_t *p = (*l)-logger_private;
-if (p) {
- fflush(p-logfile);
- fclose(p-logfile);
- free(p);
-}
+fflush(p-logfile);
+fclose(p-logfile);
+free(p);
free(*l);
*l = NULL;
@@ -471,6 +470,20 @@
return map_get_int(m, buf, def);
}
+int jk_get_worker_recycle_timeout(jk_map_t *m, const char *wname, int def)
+{
+char buf[1024];
+
+if (!m || !wname) {
+return -1;
+}
+
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
+RECYCLE_TIMEOUT_OF_WORKER);
+
+return map_get_int(m, buf, def);
+}
+
int jk_get_worker_recovery_opts(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
@@ -520,7 +533,7 @@
jk_log_fmt = (logformat) ? logformat : JK_TIME_FORMAT;
}
-double jk_get_lb_factor(jk_map_t *m, const char *wname)
+int jk_get_lb_factor(jk_map_t *m, const char *wname)
{
char buf[1024];
@@ -530,7 +543,7 @@
sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname, LOAD_FACTOR_OF_WORKER);
-return map_get_double(m, buf, DEFAULT_LB_FACTOR);
+return map_get_int(m, buf, DEFAULT_LB_FACTOR);
}
int jk_get_is_sticky_session(jk_map_t *m, const char *wname)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_worker.c
mturk 2004/11/08 05:48:56 Modified:jk/native/common jk_worker.c Log: Use integers for lbfactors Revision ChangesPath 1.18 +1 -1 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_worker.c 5 Nov 2004 15:28:39 - 1.17 +++ jk_worker.c 8 Nov 2004 13:48:56 - 1.18 @@ -160,7 +160,7 @@ } } } -jk_map_free(worker_map); +map_free(worker_map); } static int build_worker_map(jk_map_t *init_data, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Newest JK commits
Hi all, I've done some JK commits that I've been testing for a long time. The major addition is socket timeout that was missing, causing couple of minutes delays on some platforms if tomcat was down. Also I've back ported the load balance algorithm from proxy_balancer, that actually does what it should. For example the A:lb_factor=5 and B:lb_factor=1 will now give five times more requests to host A. I have also changed one very misleading directive (socket_timeout) to recycle_timeout. The socket_timeout directive is now what it should be (the timeout for the socket), while the recycle_timeout is the inactive socket timeout. I have also revert Jean-Frederic's latest map_free changes (by mistake). Further more IMO we should prefix all public functions using jk_. That's about it. I have tested all patches on unix and win32. What I'd like to see is if I broke something on AIX (Henry ?) and Netware (Norm, Guenter?) Cheers, MLaden. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Newest JK commits
Hi, Cool. Are you planning a JK release soon? Yoav Shapira http://www.yoavshapira.com -Original Message- From: Mladen Turk [mailto:[EMAIL PROTECTED] Sent: Monday, November 08, 2004 9:05 AM To: Tomcat Developers List Subject: Newest JK commits Hi all, I've done some JK commits that I've been testing for a long time. The major addition is socket timeout that was missing, causing couple of minutes delays on some platforms if tomcat was down. Also I've back ported the load balance algorithm from proxy_balancer, that actually does what it should. For example the A:lb_factor=5 and B:lb_factor=1 will now give five times more requests to host A. I have also changed one very misleading directive (socket_timeout) to recycle_timeout. The socket_timeout directive is now what it should be (the timeout for the socket), while the recycle_timeout is the inactive socket timeout. I have also revert Jean-Frederic's latest map_free changes (by mistake). Further more IMO we should prefix all public functions using jk_. That's about it. I have tested all patches on unix and win32. What I'd like to see is if I broke something on AIX (Henry ?) and Netware (Norm, Guenter?) Cheers, MLaden. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Mladen Turk wrote: Hi all, I've done some JK commits that I've been testing for a long time. The major addition is socket timeout that was missing, causing couple of minutes delays on some platforms if tomcat was down. Also I've back ported the load balance algorithm from proxy_balancer, that actually does what it should. For example the A:lb_factor=5 and B:lb_factor=1 will now give five times more requests to host A. I have also changed one very misleading directive (socket_timeout) to recycle_timeout. The socket_timeout directive is now what it should be (the timeout for the socket), while the recycle_timeout is the inactive socket timeout. Have you updated the docs for the lb_factor and socket_timeout changes? I have also revert Jean-Frederic's latest map_free changes (by mistake). Further more IMO we should prefix all public functions using jk_. That's about it. I have tested all patches on unix and win32. What I'd like to see is if I broke something on AIX (Henry ?) and Netware (Norm, Guenter?) Cheers, MLaden. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Jess Holle wrote: Mladen Turk wrote: I've done some JK commits that I've been testing for a long time. Have you updated the docs for the lb_factor and socket_timeout changes? That's the thing I'm planing for the all next week. I would like to rewrite the entire JK docs using Tomcat's style and build process. Also we should make clear what we are going to support (making JK2 as unsupported), advertising new mod_proxy and proxy_ajp, etc. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Mladen Turk wrote: Jess Holle wrote: Mladen Turk wrote: I've done some JK commits that I've been testing for a long time. Have you updated the docs for the lb_factor and socket_timeout changes? That's the thing I'm planing for the all next week. I would like to rewrite the entire JK docs using Tomcat's style and build process. Also we should make clear what we are going to support (making JK2 as unsupported), advertising new mod_proxy and proxy_ajp, etc. Style is well and good, but the clarity around JK2, etc, is priceless! -- Jess Holle - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Shapira, Yoav wrote: Hi, Cool. Are you planning a JK release soon? I'd like to clear the JK logging first, cleaning everything that's misleading and confusing. I personally added few stuff to JK loggs and have no idea for what :). Also I really like to make sure the docs are in sync with the software itself. So, IMO we should plan the release by the end of this month. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
FW: Building isapi_redirector2.dll Win32 Release
Re-post from user list. -Original Message- From: Derrick Koes [mailto:[EMAIL PROTECTED] Sent: Wednesday, November 03, 2004 2:08 PM To: [EMAIL PROTECTED] Cc: Tim Lucia Subject: Building isapi_redirector2.dll Win32 Release I pulled the latest from CVS yesterday (11/02/04) and I think I have all the dependencies that I know of set up correctly, but the isapi Win32 Release still has errors. I'm not really certain what to do next. I want the file upload fix (~ 04/09/04) which is not available in the latest released dll (2.0.4 -- 03/26/04). I *may* be able to fix some of the errors with jk_isapi_plugin.c myself, but does anyone know where pcre.h exists? Yes, I know about M. Turk's dll http://jakarta.apache.org/~mturk/, but I'd like to be able to build the fix myself. Any assistance is appreciated. Below is the build out from building with MS Dev Studio Visual C++ 6.0 SP6. Configuration: isapi - Win32 Release Creating resources from ..\..\common\jk_logger_win32_message.mc MC: Compiling ..\..\common\jk_logger_win32_message.mc Compiling resources... Compiling... jk_channel.c jk_channel_apr_socket.c jk_channel_jni.c jk_channel_un.c jk_config.c jk_config_file.c jk_endpoint.c jk_env.c jk_handler_logon.c jk_handler_response.c jk_iis_thread_pool.c jk_isapi_plugin.c C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(160) : error C2065: 'SF_NOTIFY_AUTH_COMPLETE' : undeclared identifier C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(160) : warning C4018: '==' : signed/unsigned mismatch C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(229) : warning C4018: '==' : signed/unsigned mismatch C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(231) : error C2065: 'PHTTP_FILTER_AUTH_COMPLETE_INFO' : undeclared identifier C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(231) : error C2146: syntax error : missing ')' before identifier 'pvNotification' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(231) : warning C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,void *,unsigned long *)' differs in levels of indirection from ' int ' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(231) : error C2059: syntax error : ')' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(234) : error C2146: syntax error : missing ')' before identifier 'pvNotification' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(234) : warning C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,char *)' differs in levels of indirection from 'int ' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(234) : error C2059: syntax error : ')' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(237) : error C2146: syntax error : missing ')' before identifier 'pvNotification' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(237) : warning C4047: '=' : 'int (__stdcall *)(struct _HTTP_FILTER_CONTEXT *,char *,char *)' differs in levels of indirection from 'int ' C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\se rver\isapi\jk_isapi_plugin.c(237) : error C2059: syntax error : ')' jk_jni_aprImpl.c jk_logger_file.c jk_logger_win32.c jk_map.c jk_md5.c jk_msg_ajp.c jk_mutex.c jk_mutex_proc.c jk_mutex_thread.c jk_nwmain.c jk_objCache.c jk_pool_apr.c jk_registry.c jk_requtil.c jk_service_iis.c jk_shm.c jk_signal.c jk_uriEnv.c C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\co mmon\jk_uriEnv.c(35) : fatal error C1083: Cannot open include file: 'pcre.h': No such file or directory jk_uriMap.c C:\cvs\jakarta-tomcat-connectors\jakarta-tomcat-connectors\jk\native2\co mmon\jk_uriMap.c(42) : fatal error C1083: Cannot open include file: 'pcre.h': No such file or directory jk_user.c jk_vm_default.c jk_worker_ajp13.c jk_worker_jni.c jk_worker_lb.c jk_worker_run.c jk_worker_status.c jk_workerEnv.c Error executing cl.exe. isapi_redirector2.dll - 10 error(s), 9 warning(s) ContactInfo NameDerrick Koes/Name TitleSenior Software Engineer/Title Company name=SkillSoft url=http://www.skillsoft.com/ AIMcodeauthor2001/AIM Email[EMAIL PROTECTED]/Email Phone(603) 305-1753/Phone Fax/ Quote attributedTo=YodaNo, try not, do or do not, there is no try./Quote /ContactInfo - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL
Re: Newest JK commits
I'll try on Linux, no AIX around. Could try to make a OS/400 build also :) On Mon, 08 Nov 2004 15:33:26 +0100, Mladen Turk [EMAIL PROTECTED] wrote: Shapira, Yoav wrote: Hi, Cool. Are you planning a JK release soon? I'd like to clear the JK logging first, cleaning everything that's misleading and confusing. I personally added few stuff to JK loggs and have no idea for what :). Also I really like to make sure the docs are in sync with the software itself. So, IMO we should plan the release by the end of this month. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: FW: Building isapi_redirector2.dll Win32 Release
Derrick Koes wrote: I *may* be able to fix some of the errors with jk_isapi_plugin.c myself, but does anyone know where pcre.h exists? Yes, I know about M. Turk's dll http://jakarta.apache.org/~mturk/, but I'd like to be able to build the fix myself. Hi Derrick, JK2 is officially unsupported. Regarding your builds... You will need MSSDK 2003, apr, apr-util, apr-iconv and pcre from Apache2, as well as J2SDK. The SDK includes should precede the one from MSVC6. You see... Too much to maintain. Regards, MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Henri Gomez wrote: I'll try on Linux, no AIX around. Could try to make a OS/400 build also :) Weel, if it's EBCDIC then OK :). Cheers, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
OS/400 is EBCDIC On Mon, 08 Nov 2004 16:52:43 +0100, Mladen Turk [EMAIL PROTECTED] wrote: Henri Gomez wrote: I'll try on Linux, no AIX around. Could try to make a OS/400 build also :) Weel, if it's EBCDIC then OK :). Cheers, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Re: Newest JK commits
Could we drop all these accounts with autoresponder, it's borring On 8 Nov 2004 10:54:53 EST, Autoresponder [EMAIL PROTECTED] wrote: Hello. To contact MusicLab Support please visit http://www.musiclab.com/support/contact.htm page, fill-in the appropriate fields and click the Send Message button. Thank you! MusicLab Autoresponder. P.S. Please don't forget to check your computer for [EMAIL PROTECTED] virus with Symantec virus removal tool (http://securityresponse.symantec.com/avcenter/FixSbigF.exe). You can read more about this virus here: http://securityresponse.symantec.com/avcenter/venc/data/[EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
org.apache.catalina.authenticator.SSLAutheticator
I am curious why SSLAuthenticator does not/cannot compare some attribute of the client cert with the remote address (requestor)? Without such a check, it seems to me that certificates are as easily shared as the credentials used in basic authentication. Also, why do the realm implementations always return null for getPrincipal? Couldn't they lookup the user on the users database, ignoring password, to establish authorized roles? The combination of these two things seems to me to really limit the usefulness of client certificate authentication because authentication provides little guarantee of who the client is, and even if it did, the client is denied access to any protected resources. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Newest JK commits
Mladen Turk wrote: Hi all, I've done some JK commits that I've been testing for a long time. The major addition is socket timeout that was missing, causing couple of minutes delays on some platforms if tomcat was down. Also I've back ported the load balance algorithm from proxy_balancer, that actually does what it should. For example the A:lb_factor=5 and B:lb_factor=1 will now give five times more requests to host A. I have also changed one very misleading directive (socket_timeout) to recycle_timeout. The socket_timeout directive is now what it should be (the timeout for the socket), while the recycle_timeout is the inactive socket timeout. I have also revert Jean-Frederic's latest map_free changes (by mistake). Further more IMO we should prefix all public functions using jk_. That's about it. I have tested all patches on unix and win32. What I'd like to see is if I broke something on AIX (Henry ?) and Netware (Norm, Guenter?) Cheers, MLaden. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] . Good morning, Missed a patch perhaps? A build on Apache 2.1 shows symbols F_GETFL, F_SETFL as undefined and a text search through the JTC source tree finds the only references in jk_connect.c Norm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: org.apache.catalina.authenticator.SSLAutheticator
- Original Message - From: Ken Sims [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, November 08, 2004 8:25 AM Subject: org.apache.catalina.authenticator.SSLAutheticator I am curious why SSLAuthenticator does not/cannot compare some attribute of the client cert with the remote address (requestor)? Without such a check, it seems to me that certificates are as easily shared as the credentials used in basic authentication. There are plenty of tutorials on CLIENT-CERT auth out there. I suggest that you read one :). Also, why do the realm implementations always return null for getPrincipal? Couldn't they lookup the user on the users database, ignoring password, to establish authorized roles? Usually when you seriously want CLIENT-CERT, you find that you need a custom Realm anyway. There isn't really a one-size-fits-all solution. Where it is implemented in TC (MemoryRealm, and UDBRealm in 5.5.x), it authenticates against the Subject. In a lot of cases, you really only want the CN, or the CN+EMAIL fields. In other cases (e.g. JNDI, JAAS) you might want the entire cert. You can look through BZ for TC 4 to find several examples of proposed implementations. That said, patches are always welcome :). The combination of these two things seems to me to really limit the usefulness of client certificate authentication because authentication provides little guarantee of who the client is, and even if it did, the client is denied access to any protected resources. This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31912] - Add .css and .png to ReplicationValve filter in server.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=31912. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=31912 Add .css and .png to ReplicationValve filter in server.xml --- Additional Comments From [EMAIL PROTECTED] 2004-11-08 20:43 --- I think adding .jpeg would also be a good idea, it's a very common extension for JPEGs. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: org.apache.catalina.authenticator.SSLAutheticator
Thank you for your thoughts. I have done a lot of reading on the topic of CLIENT-CERT/SSL and Tomcat from Google searches as well as the source code of SSLAuthenticator. However I see nothing to indicate how a server would know you from me if I gave you my keystore and keystore password. The server would authenticate you as me. Many tests on my part indicate that is so. Funny that the client does this against the server's cert by default. I modified a version of SSLAuthenticator to do hostname verification with success, but it seemed to me like something that is either a real omission in Tomcat (perhaps on the basis of adherence to a standards spec.?) or some conceptual misunderstanding on my part. In deference to the thought that I was missing something, I was hoping to hear what I might look at specifically to revert to stock code for SSLAuthenticator. -Original Message- From: Bill Barker [mailto:[EMAIL PROTECTED] Sent: Monday, November 08, 2004 12:05 PM To: Tomcat Developers List Subject: Re: org.apache.catalina.authenticator.SSLAutheticator - Original Message - From: Ken Sims [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Monday, November 08, 2004 8:25 AM Subject: org.apache.catalina.authenticator.SSLAutheticator I am curious why SSLAuthenticator does not/cannot compare some attribute of the client cert with the remote address (requestor)? Without such a check, it seems to me that certificates are as easily shared as the credentials used in basic authentication. There are plenty of tutorials on CLIENT-CERT auth out there. I suggest that you read one :). Also, why do the realm implementations always return null for getPrincipal? Couldn't they lookup the user on the users database, ignoring password, to establish authorized roles? Usually when you seriously want CLIENT-CERT, you find that you need a custom Realm anyway. There isn't really a one-size-fits-all solution. Where it is implemented in TC (MemoryRealm, and UDBRealm in 5.5.x), it authenticates against the Subject. In a lot of cases, you really only want the CN, or the CN+EMAIL fields. In other cases (e.g. JNDI, JAAS) you might want the CN+entire cert. You can look through BZ for TC 4 to find several examples of proposed implementations. That said, patches are always welcome :). The combination of these two things seems to me to really limit the usefulness of client certificate authentication because authentication provides little guarantee of who the client is, and even if it did, the client is denied access to any protected resources. This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Enhancement: mod_jk-Logging
Hi Mladen, hi everyone,
i have a proposal for a slight enhancement concerning the log format of
mod_jk. Maybe you could consider including it in your recently revised
code. It contains only changes to jk_util.c and I attach a patch relativ
to version 1.32 of the file.
1) Include the log level of a message in the log line. That should be
easy and is very helpful to find relevant messages. It is pretty
standard and much more safe than relying on the fact, that most error
messages actually contain the word error in the message text.
2) Include the PID of the logging process in the log file. That helps a
lot at least for Apache 1.3, because one can also log the PID in Apaches
access log. So it is easier to relate request info from access log lines
and errors from mod_jk log lines to each other. Also it helps to
unmangle, if log lines from several parallel requests are mixed inside
mod_jk-log.
The patch is small, but since I'm not a very experienced C developer
please check. I borrowed a define for Netware for getpid() from Apache's
code. Not sure if it will work for Netware, or if configure needs to be
enhanced, if we use getpid(). It builds well on Solaris.
Thank's for considering.
*** jk_util.c Tue Jul 13 15:58:10 2004
--- jk_util.c.new Thu Aug 12 18:11:50 2004
***
*** 85,90
--- 85,98
const char * jk_log_fmt = JK_TIME_FORMAT;
+ int log_level_max = 3;
+ static const char *log_levels[] = {
+ JK_LOG_DEBUG_VERB,
+ JK_LOG_INFO_VERB,
+ JK_LOG_ERROR_VERB,
+ JK_LOG_EMERG_VERB
+ };
+
static void set_time_str(char * str, int len)
{
time_t t = time(NULL);
***
*** 250,255
--- 258,274
f++;
}
+ const char *log_level;
+ if ( level =0 level = log_level_max ) {
+ log_level=log_levels[level];
+ } else {
+ log_level=unknown;
+ }
+
+ #ifdef NETWARE
+ #define getpid() ((pid_t)GetThreadGroupID())
+ #endif
+
#ifdef USE_SPRINTF /* until we get a snprintf function */
#ifdef NETWARE
buf = (char *) malloc(HUGE_BUFFER_SIZE);
***
*** 256,268
if (NULL == buf)
return -1;
#endif
! set_time_str(buf, HUGE_BUFFER_SIZE);
! used = strlen(buf);
if(line)
used += sprintf(buf[used], [%s (%d)]: , f, line);
#else
! set_time_str(buf, HUGE_BUFFER_SIZE);
! used = strlen(buf);
if(line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
#endif
--- 275,289
if (NULL == buf)
return -1;
#endif
! set_time_str(buf, HUGE_BUFFER_SIZE);
! used = strlen(buf);
! used += sprintf(buf[used], [%s] [%ld], log_level, (long)getpid());
if(line)
used += sprintf(buf[used], [%s (%d)]: , f, line);
#else
! set_time_str(buf, HUGE_BUFFER_SIZE);
! used = strlen(buf);
! used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s] [%ld],
log_level, (long)getpid());
if(line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Enhancement: mod_jk-Logging
Rainer Jung wrote: Hi Mladen, hi everyone, i have a proposal for a slight enhancement concerning the log format of mod_jk. Maybe you could consider including it in your recently revised code. It contains only changes to jk_util.c and I attach a patch relativ to version 1.32 of the file. Hi Rainer. You are definitely on my track :). I'm planning to add one additional log level, and clear all the log messages. 1. ERROR - fatal operations 2. WARN - problems but not fatal 3. INFO - production logging 4. DEBUG - protocol tracing 5. TRACE - function call logging 1) Include the log level of a message in the log line. 2) Include the PID of the logging process in the log file. I'd like to make a customizable log line, in the JkRequestLogFormat fashion to be able to add PID/ThreadId, level, etc... MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
AUTO {TOML#001-402-139}Enhancement: mod_jk-Logging
Dear Customer, Thank you for your interest in the services offered by TimesofMoney.com.We have received your email. Our Customer Relations Officer will get in touch with you shortly. In case you would like to speak to our representatives, you can reach us at these numbers : 2207 2072 (Bombay),5695 9581 (Bangalore),2435 5588 (Chennai), 2335 2581 (Hyderabad)Assuring you of our best services always. Warm Regards, Customer Relations TimesofMoney.com A Times Group Company - This is an automated response. Please do not respond to this email. -
