cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c

[mturk]

mturk       2002/09/21 00:29:47

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  Fix the memory leaks using not using global env allocation on
  each request and freeing global env after the request.
  
  Revision  Changes    Path
  1.43      +10 -6     
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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- jk_isapi_plugin.c 15 Aug 2002 11:23:30 -0000      1.42
  +++ jk_isapi_plugin.c 21 Sep 2002 07:29:47 -0000      1.43
  @@ -469,7 +469,10 @@
       env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
                     "HttpExtensionProc started\n");
   
  -    GET_SERVER_VARIABLE_VALUE(workerEnv->pool,HTTP_WORKER_HEADER_NAME, ( 
worker_name ));
  +    huge_buf_sz = sizeof(huge_buf);
  +    get_server_value(lpEcb, HTTP_WORKER_HEADER_NAME, huge_buf, huge_buf_sz, "");
  +    worker_name = huge_buf;
  +
       worker=env->getByName( env, worker_name);
   
       env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  @@ -514,10 +517,6 @@
   
       s->afterRequest(env, s);
   
  -    rPool->reset(env, rPool);
  -
  -    rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );       
  -
       if (service != NULL) {
           lpEcb->ServerSupportFunction(lpEcb->ConnID, 
                                        HSE_REQ_DONE_WITH_SESSION, 
  @@ -525,6 +524,11 @@
                                        NULL, 
                                        NULL);
       }
  +    rPool->reset(env, rPool);
  +    rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
  +
  +    workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  +
       return rc;
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>