Patch that fixes the bug

jk_isapi_plugin.c.patch (text/plain), 1.84 KB, created by Martin Goldhahn on 2005-07-26 12:48:12 UTC

(hide)

Description: Patch that fixes the bug

Filename:

MIME Type:

Creator: Martin Goldhahn

Created: 2005-07-26 12:48:12 UTC

Size: 1.84 KB

patch

obsolete

>--- jk_isapi_plugin.c 18 May 2005 18:04:53 -0000 1.49 >+++ jk_isapi_plugin.c 26 Jul 2005 10:11:58 -0000 >@@ -122,6 +122,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"; >@@ -1059,6 +1060,11 @@ > uri_worker_map_free(&uw_map, logger); > is_mapread = JK_FALSE; > } >+ //jk_close_pool(&worker_env.p); >+ 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); >@@ -1109,7 +1115,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; >@@ -1148,14 +1153,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; > } > } >@@ -1163,7 +1168,6 @@ > jk_log(logger, JK_LOG_EMERG, > "Unable to read worker file %s.", worker_file); > } >- jk_map_free(&map); > } > } > > View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]