cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c

[mturk]

mturk       2005/02/14 23:30:50

  Modified:    jk/native/apache-1.3 mod_jk.c
               jk/native/apache-2.0 mod_jk.c
  Log:
  Add $(ServerRoot) to map properties.
  
  Revision  Changes    Path
  1.68      +3 -2      jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- mod_jk.c  14 Feb 2005 10:36:12 -0000      1.67
  +++ mod_jk.c  15 Feb 2005 07:30:49 -0000      1.68
  @@ -1817,6 +1817,7 @@
       c->envvars = ap_make_table(p, 0);
   
       c->s = s;
  +    jk_map_put(c->worker_properties, "ServerRoot", ap_server_root, NULL);
   
       return c;
   }
  @@ -1927,7 +1928,7 @@
   for (i = 0; i < jk_map_size(conf->automount); i++)
   {
               char *name = jk_map_name_at(conf->automount, i);
  -            jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and virtualhost = 
%s", name, map_get_string(conf->automount, name, NULL));
  +                     jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and 
virtualhost = %s", name, map_get_string(conf->automount, name, NULL));
   }
   }
   */
  
  
  
  1.125     +2 -2      jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- mod_jk.c  13 Feb 2005 12:24:18 -0000      1.124
  +++ mod_jk.c  15 Feb 2005 07:30:49 -0000      1.125
  @@ -2026,7 +2026,7 @@
       c->envvars = apr_table_make(p, 0);
   
       c->s = s;
  -
  +    jk_map_put(c->worker_properties, "ServerRoot", ap_server_root, NULL);
       apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup, 
jk_apr_pool_cleanup);
       return c;
   }
  
  
  

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