mmanders 01/11/29 12:02:44
Modified: jk/native/netscape jk_nsapi_plugin.c
Log:
Added default worker_env to prevent GPF during startup.
Set ssl_key_size to -1 for now until we can determine if this is available from the
webserver, and how to configure it (ala JkOptions for Apache module.)
Revision Changes Path
1.7 +6 -3 jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
Index: jk_nsapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_nsapi_plugin.c 2001/11/07 21:46:28 1.6
+++ jk_nsapi_plugin.c 2001/11/29 20:02:44 1.7
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: NSAPI plugin for Netscape servers *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
@@ -89,6 +89,7 @@
static int init_on_other_thread_is_ok = JK_FALSE;
static jk_logger_t *logger = NULL;
+static jk_worker_env_t worker_env;
#ifdef NETWARE
int (*PR_IsSocketSecure)(SYS_NETFD *csd); /* pointer to PR_IsSocketSecure function
*/
@@ -131,7 +132,7 @@
jk_map_t *init_map = (jk_map_t *)init_d;
/* we add the URI->WORKER MAP since workers using AJP14 will feed it */
/* but where are they here in Netscape ? */
- if(wc_open(init_map, NULL, logger)) {
+ if(wc_open(init_map, &worker_env, logger)) {
init_on_other_thread_is_ok = JK_TRUE;
} else {
jk_log(logger, JK_LOG_EMERG, "In init_workers_on_other_threads, failed\n");
@@ -269,7 +270,7 @@
int rc = REQ_ABORTED;
jk_map_t *init_map;
- fprintf(stderr, "In jk_init %s %s %s\n",worker_prp_file, log_level_str,
log_file);
+ fprintf(stderr, "In jk_init.\n Worker file = %s.\n Log level = %s.\n Log
File = %s\n",worker_prp_file, log_level_str, log_file);
if(!worker_prp_file) {
worker_prp_file = JK_WORKER_FILE_DEF;
}
@@ -455,6 +456,8 @@
else
#endif
s->is_ssl = security_active;
+
+ s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
if(s->is_ssl) {
s->ssl_cert = pblock_findval("auth-cert", private_data->rq->vars);
if(s->ssl_cert) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
