You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by na...@apache.org on 2002/05/04 21:06:31 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
nacho 02/05/04 12:06:31
Modified: jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
Log:
* Fixed it seems that the pool now resides at the mbean
Revision Changes Path
1.13 +2 -2 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_isapi_plugin.c 1 May 2002 22:23:36 -0000 1.12
+++ jk_isapi_plugin.c 4 May 2002 19:06:31 -0000 1.13
@@ -60,7 +60,7 @@
* Author: Gal Shachor <sh...@il.ibm.com> *
* Author: Larry Isaacs <la...@apache.org> *
* Author: Ignacio J. Ortega <na...@apache.org> *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***************************************************************************/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -463,7 +463,7 @@
be shared with other server adapters */
rPool= worker->rPoolCache->get( env, worker->rPoolCache );
if( rPool == NULL ) {
- rPool=worker->pool->create( env, worker->pool, HUGE_POOL_SIZE );
+ rPool=worker->mbean->pool->create( env, worker->mbean->pool, HUGE_POOL_SIZE );
env->l->jkLog(env, env->l, JK_LOG_INFO,
"HttpExtensionProc: new rpool\n");
}
1.14 +11 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_service_iis.c 1 May 2002 22:23:36 -0000 1.13
+++ jk_service_iis.c 4 May 2002 19:06:31 -0000 1.14
@@ -285,26 +285,26 @@
s->jvm_route = NULL;
- GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_URI_HEADER_NAME, s->req_uri);
- GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_QUERY_HEADER_NAME, s->query_string);
+ 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);
if (s->req_uri == NULL) {
s->query_string = lpEcb->lpszQueryString;
/* *worker_name = DEFAULT_WORKER_NAME; */
- GET_SERVER_VARIABLE_VALUE(w->pool,"URL", s->req_uri);
+ GET_SERVER_VARIABLE_VALUE(w->mbean->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->pool,"AUTH_TYPE", s->auth_type);
- GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_USER", s->remote_user);
- GET_SERVER_VARIABLE_VALUE(w->pool,"SERVER_PROTOCOL", s->protocol);
- GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_HOST", s->remote_host);
- GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_ADDR", s->remote_addr);
- GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_NAME, s->server_name);
+ 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_INT("SERVER_PORT", s->server_port, 80);
- GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_SOFTWARE, s->server_software);
+ GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_SOFTWARE, s->server_software);
GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
s->method = lpEcb->lpszMethod;
@@ -352,7 +352,7 @@
unsigned num_of_vars = 0;
for(i = 0 ; i < 9 ; i++) {
- GET_SERVER_VARIABLE_VALUE(w->pool,ssl_env_names[i], ssl_env_values[i]);
+ GET_SERVER_VARIABLE_VALUE(w->mbean->pool,ssl_env_names[i], ssl_env_values[i]);
if (ssl_env_values[i]) {
num_of_vars++;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>