mturk 2005/09/12 07:10:51 Modified: jk/native/iis jk_isapi_plugin.c Log: Fix #35864 Status worker doesn't list workers Patch provided by Martin Goldhahn Revision Changes Path 1.52 +9 -6 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c Index: jk_isapi_plugin.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- jk_isapi_plugin.c 12 Sep 2005 13:46:00 -0000 1.51 +++ jk_isapi_plugin.c 12 Sep 2005 14:10:51 -0000 1.52 @@ -133,6 +133,7 @@ static int iis5 = -1; static jk_uri_worker_map_t *uw_map = NULL; +static jk_map_t *wp_map = NULL; /* worker_properties */ static jk_logger_t *logger = NULL; static char *SERVER_NAME = "SERVER_NAME"; static char *SERVER_SOFTWARE = "SERVER_SOFTWARE"; @@ -1070,6 +1071,10 @@ uri_worker_map_free(&uw_map, logger); is_mapread = JK_FALSE; } + memset(&worker_env, 0, sizeof(worker_env)); + if (wp_map) { + jk_map_free(&wp_map); + } wc_close(logger); if (logger) { jk_close_file_logger(&logger); @@ -1125,7 +1130,6 @@ static int init_jk(char *serverName) { int rc = JK_FALSE; - jk_map_t *map; if (!jk_open_file_logger(&logger, log_file, log_level)) { logger = NULL; @@ -1164,14 +1168,14 @@ } if (rc) { rc = JK_FALSE; - if (jk_map_alloc(&map)) { - if (jk_map_read_properties(map, worker_file, NULL)) { + if (jk_map_alloc(&wp_map)) { + if (jk_map_read_properties(wp_map, worker_file, NULL)) { /* we add the URI->WORKER MAP since workers using AJP14 will feed it */ worker_env.uri_to_worker = uw_map; worker_env.server_name = serverName; - if (wc_open(map, &worker_env, logger)) { + if (wc_open(wp_map, &worker_env, logger)) { rc = JK_TRUE; } } @@ -1179,7 +1183,6 @@ jk_log(logger, JK_LOG_EMERG, "Unable to read worker file %s.", worker_file); } - jk_map_free(&map); } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]