Author: rjung
Date: Sun Sep 30 13:53:54 2007
New Revision: 580785
URL: http://svn.apache.org/viewvc?rev=580785&view=rev
Log:
Remove configuration attributes secret_key and automount
(directive JkAutoMount) from httpd module.
They were never documented and didn't have any functionality
apart from eating memory and bloating code either.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580785&r1=580784&r2=580785&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 13:53:54
2007
@@ -137,8 +137,6 @@
jk_map_t *uri_to_context;
int mountcopy;
- char *secret_key;
- jk_map_t *automount;
jk_uri_worker_map_t *uw_map;
@@ -909,28 +907,6 @@
}
/*
- * JkAutoMount directive handling
- *
- * JkAutoMount worker [virtualhost]
- */
-
-static const char *jk_automount_context(cmd_parms * cmd,
- void *dummy,
- char *worker, char *virtualhost)
-{
- server_rec *s = cmd->server;
- jk_server_conf_t *conf =
- (jk_server_conf_t *) ap_get_module_config(s->module_config,
- &jk_module);
-
- /*
- * Add the new automount to the auto map.
- */
- jk_map_put(conf->automount, worker, virtualhost, NULL);
- return NULL;
-}
-
-/*
* JkWorkersFile Directive Handling
*
* JkWorkersFile file
@@ -1857,13 +1833,6 @@
"the reload check interval of the mount file"},
/*
- * JkAutoMount specifies that the list of handled URLs must be
- * asked to the servlet engine (autoconf feature)
- */
- {"JkAutoMount", jk_automount_context, NULL, RSRC_CONF, TAKE12,
- "automatic mount points to a servlet-engine worker"},
-
- /*
* JkMount mounts a url prefix to a worker (the worker need to be
* defined in the worker properties file.
*/
@@ -2260,11 +2229,7 @@
if (!jk_map_alloc(&(c->uri_to_context))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
- if (!jk_map_alloc(&(c->automount))) {
- jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
- }
c->uw_map = NULL;
- c->secret_key = NULL;
c->envvars_in_use = JK_FALSE;
c->envvars = ap_make_table(p, 0);
@@ -2328,9 +2293,6 @@
if (!overrides->key_size_indicator)
overrides->key_size_indicator = base->key_size_indicator;
- if (!overrides->secret_key)
- overrides->secret_key = base->secret_key;
-
overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars_in_use) {
@@ -2365,7 +2327,6 @@
if (overrides->mountcopy) {
copy_jk_map(p, overrides->s, base->uri_to_context,
overrides->uri_to_context);
- copy_jk_map(p, overrides->s, base->automount, overrides->automount);
if (!overrides->mount_file)
overrides->mount_file = base->mount_file;
if (!overrides->alias_dir)
@@ -2607,19 +2568,6 @@
* to make sure log file gets closed in the parent process */
ap_register_cleanup(p, s, jk_server_cleanup, ap_null_cleanup);
-/*
-{ int i;
-if (JK_IS_DEBUG_LEVEL(conf->log))
- jk_log(conf->log, JK_LOG_DEBUG, "default secret key = %s",
conf->secret_key);
-for (i = 0; i < jk_map_size(conf->automount); i++)
-{
- char *name = jk_map_name_at(conf->automount, i);
- if (JK_IS_DEBUG_LEVEL(conf->log))
- jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and virtualhost =
%s", name, map_get_string(conf->automount, name, NULL));
-}
-}
-*/
-
if ((conf->worker_file != NULL) &&
!jk_map_read_properties(init_map, conf->worker_file, NULL,
JK_MAP_HANDLE_DUPLICATES, conf->log)) {
@@ -2936,7 +2884,6 @@
uri_worker_map_free(&(conf->uw_map), NULL);
jk_map_free(&(conf->uri_to_context));
jk_map_free(&(conf->worker_properties));
- jk_map_free(&(conf->automount));
}
tmp = tmp->next;
}
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580785&r1=580784&r2=580785&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 13:53:54
2007
@@ -166,8 +166,6 @@
jk_map_t *uri_to_context;
int mountcopy;
- char *secret_key;
- jk_map_t *automount;
jk_uri_worker_map_t *uw_map;
@@ -937,29 +935,6 @@
/*
- * JkAutoMount directive handling
- *
- * JkAutoMount worker [virtualhost]
- * This is an experimental and undocumented extension made in j-t-c/jk.
- */
-static const char *jk_automount_context(cmd_parms * cmd,
- void *dummy,
- const char *worker,
- const char *virtualhost)
-{
- server_rec *s = cmd->server;
- jk_server_conf_t *conf =
- (jk_server_conf_t *) ap_get_module_config(s->module_config,
- &jk_module);
-
- /*
- * Add the new automount to the auto map.
- */
- jk_map_put(conf->automount, worker, virtualhost, NULL);
- return NULL;
-}
-
-/*
* JkWorkersFile Directive Handling
*
* JkWorkersFile file
@@ -1890,13 +1865,6 @@
"the reload check interval of the mount file"),
/*
- * JkAutoMount specifies that the list of handled URLs must be
- * asked to the servlet engine (autoconf feature)
- */
- AP_INIT_TAKE12("JkAutoMount", jk_automount_context, NULL, RSRC_CONF,
- "automatic mount points to a Tomcat worker"),
-
- /*
* JkMount mounts a url prefix to a worker (the worker need to be
* defined in the worker properties file.
*/
@@ -2306,8 +2274,6 @@
jk_map_free(&conf->worker_properties);
if (conf->uri_to_context)
jk_map_free(&conf->uri_to_context);
- if (conf->automount)
- jk_map_free(&conf->automount);
if (conf->uw_map)
uri_worker_map_free(&conf->uw_map, NULL);
conf->was_initialized = JK_FALSE;
@@ -2379,12 +2345,8 @@
if (!jk_map_alloc(&(c->uri_to_context))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
}
- if (!jk_map_alloc(&(c->automount))) {
- jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
- }
c->uw_map = NULL;
- c->secret_key = NULL;
c->envvars_in_use = JK_FALSE;
c->envvars = apr_table_make(p, 0);
@@ -2453,9 +2415,6 @@
if (!overrides->key_size_indicator)
overrides->key_size_indicator = base->key_size_indicator;
- if (!overrides->secret_key)
- overrides->secret_key = base->secret_key;
-
overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars_in_use) {
@@ -2490,7 +2449,6 @@
if (overrides->mountcopy) {
copy_jk_map(p, overrides->s, base->uri_to_context,
overrides->uri_to_context);
- copy_jk_map(p, overrides->s, base->automount, overrides->automount);
if (!overrides->mount_file)
overrides->mount_file = base->mount_file;
if (!overrides->alias_dir)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
