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/native/apache-2.0 mod_jk.c
Date Fri, 12 Nov 2004 08:24:43 GMT
mturk       2004/11/12 00:24:43

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Added JkWorkerProperty directive that enables omiting
  workers.properties file.
  For example: JkWorkerProperty worker.ajp13a.port=8009
  
  Revision  Changes    Path
  1.99      +26 -1     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.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- mod_jk.c	9 Nov 2004 12:17:43 -0000	1.98
  +++ mod_jk.c	12 Nov 2004 08:24:43 -0000	1.99
  @@ -1473,6 +1473,27 @@
       return NULL;
   }
   
  +/*
  + * JkWorkerProperty Directive Handling
  + *
  + * JkWorkerProperty name=value
  + */
  +
  +static const char *jk_set_worker_property(cmd_parms * cmd,
  +                                          void *dummy,
  +                                          const char *line)
  +{
  +    server_rec *s = cmd->server;
  +    jk_server_conf_t *conf =
  +        (jk_server_conf_t *) ap_get_module_config(s->module_config,
  +                                                  &jk_module);
  +    
  +    if (jk_map_read_property(conf->worker_properties, line) == JK_FALSE)
  +        return apr_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line);
  +
  +    return NULL;
  +}
  +
   static const command_rec jk_cmds[] = {
       /*
        * JkWorkersFile specifies a full path to the location of the worker
  @@ -1583,6 +1604,10 @@
       AP_INIT_TAKE2("JkEnvVar", jk_add_env_var, NULL, RSRC_CONF,
                     "Adds a name of environment variable that should be sent "
                     "to servlet-engine"),
  +
  +    AP_INIT_RAW_ARGS("JkWorkerProperty", jk_set_worker_property,
  +                     NULL, RSRC_CONF,
  +                     "Set worker.properties directive"),
   
       {NULL}
   };
  
  
  

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


Mime
View raw message