mturk 2002/09/21 00:28:48
Modified: jk/native2/server/isapi jk_service_iis.c
Log:
Fix the memory leaks using service's pool intead of worker
Revision Changes Path
1.21 +13 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_service_iis.c 8 Jul 2002 00:26:07 -0000 1.20
+++ jk_service_iis.c 21 Sep 2002 07:28:48 -0000 1.21
@@ -351,26 +351,26 @@
s->jvm_route = NULL;
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_URI_HEADER_NAME, s->req_uri);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_QUERY_HEADER_NAME,
s->query_string);
+ GET_SERVER_VARIABLE_VALUE(s->pool,HTTP_URI_HEADER_NAME, s->req_uri);
+ GET_SERVER_VARIABLE_VALUE(s->pool,HTTP_QUERY_HEADER_NAME, s->query_string);
if (s->req_uri == NULL) {
s->query_string = lpEcb->lpszQueryString;
/* *worker_name = DEFAULT_WORKER_NAME; */
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"URL", s->req_uri);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"URL", s->req_uri);
if (jk_requtil_unescapeUrl(s->req_uri) < 0)
return JK_ERR;
jk_requtil_getParents(s->req_uri);
}
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"AUTH_TYPE", s->auth_type);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_USER", s->remote_user);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"SERVER_PROTOCOL", s->protocol);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_HOST", s->remote_host);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_ADDR", s->remote_addr);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_NAME, s->server_name);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"AUTH_TYPE", s->auth_type);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"REMOTE_USER", s->remote_user);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"SERVER_PROTOCOL", s->protocol);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"REMOTE_HOST", s->remote_host);
+ GET_SERVER_VARIABLE_VALUE(s->pool,"REMOTE_ADDR", s->remote_addr);
+ GET_SERVER_VARIABLE_VALUE(s->pool,SERVER_NAME, s->server_name);
GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT", s->server_port, 80);
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_SOFTWARE, s->server_software);
+ GET_SERVER_VARIABLE_VALUE(s->pool,SERVER_SOFTWARE, s->server_software);
GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
s->method = lpEcb->lpszMethod;
@@ -441,7 +441,7 @@
unsigned num_of_vars = 0;
for(i = 0 ; i < 9 ; i++) {
- GET_SERVER_VARIABLE_VALUE(w->mbean->pool,ssl_env_names[i],
ssl_env_values[i]);
+ GET_SERVER_VARIABLE_VALUE(s->pool,ssl_env_names[i], ssl_env_values[i]);
if (ssl_env_values[i]) {
num_of_vars++;
}
@@ -588,6 +588,7 @@
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s->ws_private;
+#if 0
char *buff = s->pool->calloc(env,s->pool, 2048);
if (buff != NULL) {
/* int rd; */
@@ -596,6 +597,7 @@
/* s->content_read += rd; */
/* } */
}
+#endif
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
