cvs commit: jakarta-tomcat/src/native/mod_jk/apache2.0 mod_jk.c

[hgomez]

hgomez      01/09/05 03:02:15

  Modified:    src/native/mod_jk/apache2.0 mod_jk.c
  Log:
  Added MountCopy missing stuff for SSL
  and EnvVars
  
  Revision  Changes    Path
  1.17      +20 -0     jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_jk.c  2001/09/05 09:34:44     1.16
  +++ mod_jk.c  2001/09/05 10:02:14     1.17
  @@ -971,6 +971,15 @@
       jk_server_conf_t *base = (jk_server_conf_t *) basev;
       jk_server_conf_t *overrides = (jk_server_conf_t *)overridesv;
    
  +     if(base->ssl_enable) {
  +        overrides->ssl_enable       = base->ssl_enable;
  +        overrides->https_indicator  = base->https_indicator;
  +        overrides->certs_indicator  = base->certs_indicator;
  +        overrides->cipher_indicator = base->cipher_indicator;
  +        overrides->sesion_indicator = base->sesion_indicator;
  +    }
  +    
  +
       if(overrides->mountcopy) {
           int sz = map_size(base->uri_to_context);
           int i;
  @@ -987,6 +996,17 @@
               }
           }
       }
  +
  +    if(base->envvars_in_use) {
  +        overrides->envvars_in_use = JK_TRUE;
  +        
  +        overrides->envvars = 
  +                apr_table_overlay(p, 
  +                                  overrides->envvars, 
  +                                  base->envvars);
  +
  +    }
  +    
       if(overrides->log_file && overrides->log_level >= 0) {
           if(!jk_open_file_logger(&(overrides->log), overrides->log_file, 
overrides->log_level)) {
               overrides->log = NULL;