jfclere 2004/11/05 07:28:39
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
jk/native/common jk_map.c jk_map.h jk_util.c jk_worker.c
jk/native/domino jk_dsapi_plugin.c
jk/native/iis jk_isapi_plugin.c
jk/native/isapi jk_isapi_plugin.c
jk/native/netscape jk_nsapi_plugin.c
jk/native/nt_service jk_nt_service.c
Log:
Change map_free() to jk_map_free() because it conflics with a map_free in php.
The map_free() of php comes from cyrus-imapd-2.2.x
Revision Changes Path
1.49 +4 -4 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_jk.c 8 Oct 2004 08:55:13 -0000 1.48
+++ mod_jk.c 5 Nov 2004 15:28:39 -0000 1.49
@@ -2005,9 +2005,9 @@
if (NULL != conf) {
wc_close(conf->log);
uri_worker_map_free(&(conf->uw_map), conf->log);
- map_free(&(conf->uri_to_context));
- map_free(&(conf->worker_properties));
- map_free(&(conf->automount));
+ jk_map_free(&(conf->uri_to_context));
+ jk_map_free(&(conf->worker_properties));
+ jk_map_free(&(conf->automount));
if (conf->log)
jk_close_file_logger(&(conf->log));
}
1.97 +4 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mod_jk.c 8 Oct 2004 08:55:13 -0000 1.96
+++ mod_jk.c 5 Nov 2004 15:28:39 -0000 1.97
@@ -1844,11 +1844,11 @@
up between APR implementations. */
wc_close(NULL);
if (conf->worker_properties)
- map_free(&conf->worker_properties);
+ jk_map_free(&conf->worker_properties);
if (conf->uri_to_context)
- map_free(&conf->uri_to_context);
+ jk_map_free(&conf->uri_to_context);
if (conf->automount)
- map_free(&conf->automount);
+ jk_map_free(&conf->automount);
if (conf->uw_map)
uri_worker_map_free(&conf->uw_map, NULL);
}
1.15 +2 -2 jakarta-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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_map.c 8 Oct 2004 07:50:39 -0000 1.14
+++ jk_map.c 5 Nov 2004 15:28:39 -0000 1.15
@@ -57,7 +57,7 @@
return JK_FALSE;
}
-int map_free(jk_map_t **m)
+int jk_map_free(jk_map_t **m)
{
int rc = JK_FALSE;
1.10 +2 -2 jakarta-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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_map.h 8 Oct 2004 07:50:40 -0000 1.9
+++ jk_map.h 5 Nov 2004 15:28:39 -0000 1.10
@@ -35,7 +35,7 @@
int map_alloc(jk_map_t **m);
- int map_free(jk_map_t **m);
+ int jk_map_free(jk_map_t **m);
int map_open(jk_map_t *m);
1.31 +6 -4 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_util.c 8 Oct 2004 07:50:40 -0000 1.30
+++ jk_util.c 5 Nov 2004 15:28:39 -0000 1.31
@@ -205,9 +205,11 @@
{
if (l && *l) {
file_logger_t *p = (*l)->logger_private;
- fflush(p->logfile);
- fclose(p->logfile);
- free(p);
+ if (p) {
+ fflush(p->logfile);
+ fclose(p->logfile);
+ free(p);
+ }
free(*l);
*l = NULL;
1.17 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_worker.c 8 Oct 2004 07:50:40 -0000 1.16
+++ jk_worker.c 5 Nov 2004 15:28:39 -0000 1.17
@@ -160,7 +160,7 @@
}
}
}
- map_free(&worker_map);
+ jk_map_free(&worker_map);
}
static int build_worker_map(jk_map_t *init_data,
1.15 +3 -3 jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_dsapi_plugin.c 8 Oct 2004 08:55:13 -0000 1.14
+++ jk_dsapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.15
@@ -965,7 +965,7 @@
if (map_read_properties(map, workerMountFile))
if (uri_worker_map_alloc(&uw_map, map, logger))
ok = JK_TRUE;
- map_free(&map);
+ jk_map_free(&map);
}
DEBUG(("Got the URI worker map\n"));
@@ -1001,7 +1001,7 @@
}
DEBUG(("Read %s, OK = %d\n", workerFile, ok));
- map_free(&map);
+ jk_map_free(&map);
}
}
1.26 +4 -4 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_isapi_plugin.c 8 Oct 2004 10:37:12 -0000 1.25
+++ jk_isapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.26
@@ -1031,7 +1031,7 @@
rc = JK_TRUE;
}
- map_free(&map2);
+ jk_map_free(&map2);
}
}
else {
@@ -1039,7 +1039,7 @@
"Unable to read worker mount file %s.\n",
worker_mount_file);
}
- map_free(&map);
+ jk_map_free(&map);
}
if (rc) {
@@ -1059,7 +1059,7 @@
jk_log(logger, JK_LOG_EMERG,
"Unable to read worker file %s.\n", worker_file);
}
- map_free(&map);
+ jk_map_free(&map);
}
}
1.7 +3 -3 jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_isapi_plugin.c 8 Oct 2004 08:55:13 -0000 1.6
+++ jk_isapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.7
@@ -977,7 +977,7 @@
if (map_read_properties(map, workerMountFile))
if (uri_worker_map_alloc(&uw_map, map, logger))
ok = JK_TRUE;
- map_free(&map);
+ jk_map_free(&map);
}
DEBUG(("Got the URI worker map\n"));
@@ -1013,7 +1013,7 @@
}
DEBUG(("Read %s, OK = %d\n", workerFile, ok));
- map_free(&map);
+ jk_map_free(&map);
}
}
1.14 +2 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_nsapi_plugin.c 23 Oct 2004 03:02:32 -0000 1.13
+++ jk_nsapi_plugin.c 5 Nov 2004 15:28:39 -0000 1.14
@@ -259,7 +259,7 @@
*/
}
- map_free(&init_map);
+ jk_map_free(&init_map);
}
#ifdef NETWARE
1.11 +2 -2 jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c
Index: jk_nt_service.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_nt_service.c 24 Feb 2004 08:45:51 -0000 1.10
+++ jk_nt_service.c 5 Nov 2004 15:28:39 -0000 1.11
@@ -1034,7 +1034,7 @@
}
}
}
- map_free(&init_map);
+ jk_map_free(&init_map);
}
RegCloseKey(hk);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
