tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
Date Sun, 13 Oct 2002 07:39:28 GMT
mturk       2002/10/13 00:39:28

  Modified:    jk/native2/common jk_uriEnv.c
  Log:
  Add the inheritGlobals configuration directive to the uriEnv,
  alowing duplicating directives from globals.
  
  Revision  Changes    Path
  1.38      +11 -0     jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- jk_uriEnv.c	4 Oct 2002 16:13:15 -0000	1.37
  +++ jk_uriEnv.c	13 Oct 2002 07:39:28 -0000	1.38
  @@ -180,6 +180,9 @@
               uriEnv->aliases->put(env, uriEnv->aliases, val, uriEnv, NULL);
           }
       }
  +    else if (strcmp("inheritGlobals", name) == 0) {
  +        uriEnv->inherit_globals = atoi(val);
  +    }
       else {
           /* OLD - DEPRECATED */
           int d = 1;
  @@ -429,6 +432,14 @@
       uriEnv->workerEnv->uriMap->addUriEnv(env, uriEnv->workerEnv->uriMap,
                                            uriEnv);
       uriEnv->uriMap = uriEnv->workerEnv->uriMap;
  +
  +    /* ??? This may be turned on by default 
  +     * so that global mappings are always present
  +     * on each vhost, instead of explicitly defined.
  +     */
  +#if 0
  +    uriEnv->inherit_globals = 1;
  +#endif
   
       return JK_OK;
   }
  
  
  

--
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