tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
Date Sun, 09 Jun 2002 01:55:54 GMT
nacho       2002/06/08 18:55:54

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c
  Log:
  * Fixing the build in win32
  * Cosmetic changes
  
  Revision  Changes    Path
  1.27      +7 -7      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- jk_isapi_plugin.c	7 Jun 2002 23:45:30 -0000	1.26
  +++ jk_isapi_plugin.c	9 Jun 2002 01:55:54 -0000	1.27
  @@ -60,7 +60,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Larry Isaacs <larryi@apache.org>                           *
    * Author:      Ignacio J. Ortega <nacho@apache.org>                       *
  - * Version:     $Revision: 1.26 $                                           *
  + * Version:     $Revision: 1.27 $                                           *
    ***************************************************************************/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -100,7 +100,7 @@
   static int   iis5 = -1;
   
   static jk_workerEnv_t *workerEnv;
  -
  +static apr_pool_t *jk_globalPool;
   
   static char extension_uri[INTERNET_MAX_URL_LENGTH] = "/jakarta/isapi_redirector2.dll";
   static char worker_file[MAX_PATH * 2] = "";
  @@ -570,7 +570,10 @@
   static int init_jk(char *serverName)
   {
       int rc = JK_TRUE;  
  -       
  +    /* XXX this need review, works well because the initializations are done at the first
request 
  +       but in case inits should be splited another time using directly globalEnv here could
lead 
  +       to subtle problems.. 
  +    */   
       jk_env_t *env = workerEnv->globalEnv;
       workerEnv->initData->add( env, workerEnv->initData, "serverRoot",
                                 workerEnv->pool->pstrdup( env, workerEnv->pool,
server_root));
  @@ -698,8 +701,6 @@
       return JK_TRUE;     
   }
   
  -apr_pool_t *jk_globalPool;
  -
   
   /** Basic initialization for jk2.
    */
  @@ -728,13 +729,12 @@
       l = jkb->object;
       
       env->l=l;
  -    env->soName=env->globalPool->calloc(env, env->globalPool, strlen(file_name)+1);
  +    env->soName=env->globalPool->pstrdup(env, env->globalPool, file_name );
       
       if( env->soName == NULL ){
           env->l->jkLog(env, env->l, JK_LOG_ERROR, "Error creating env->soName\n");
           return env;
       }
  -    strcpy(env->soName,file_name);
       env->l->init(env,env->l);
   
       /* We should make it relative to JK_HOME or absolute path.
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message