svn commit: r596423 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rj...@apache.org]

Author: rjung
Date: Mon Nov 19 12:16:47 2007
New Revision: 596423

URL: http://svn.apache.org/viewvc?rev=596423&view=rev
Log:
Rename envvars_in_use to envvars_has_own reflecting better
it's new use. It indicates, if the envvars are completely
inherited from another vhost, or if the vhost has at least
one envvar which is special for it.

Port from r593915 of apache-2.0/mod_jk.c.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/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=596423&r1=596422&r2=596423&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 Mon Nov 19 12:16:47 2007
@@ -179,7 +179,7 @@
     /*
      * Environment variables support
      */
-    int envvars_in_use;
+    int envvars_has_own;
     table *envvars;
     table *envvars_def;
     array_header *envvar_items;
@@ -1797,7 +1797,7 @@
         (jk_server_conf_t *) ap_get_module_config(s->module_config,
                                                   &jk_module);
 
-    conf->envvars_in_use = JK_TRUE;
+    conf->envvars_has_own = JK_TRUE;
     if (!conf->envvars) {
         conf->envvars      = ap_make_table(cmd->pool, 0);
         conf->envvars_def  = ap_make_table(cmd->pool, 0);
@@ -2243,7 +2243,7 @@
         c->key_size_indicator = JK_ENV_KEY_SIZE;
         c->strip_session = JK_FALSE;
     }
-    c->envvars_in_use = JK_FALSE;
+    c->envvars_has_own = JK_FALSE;
 
     c->s = s;
 
@@ -2307,7 +2307,7 @@
     overrides->options |= (base->options & ~base->exclude_options);
 
     if (base->envvars) {
-        if (overrides->envvars && overrides->envvars_in_use) {
+        if (overrides->envvars && overrides->envvars_has_own) {
             merge_apr_table(base->envvars, overrides->envvars);
             merge_apr_table(base->envvars_def, overrides->envvars_def);
         }
@@ -2529,7 +2529,7 @@
                     ap_log_error(APLOG_MARK, APLOG_ERR, srv,
                                  "JkRequestLogFormat format array NULL");
             }
-            if (sconf->envvars && sconf->envvars_in_use) {
+            if (sconf->envvars && sconf->envvars_has_own) {
                 int i;
                 const array_header *arr;
                 const table_entry *elts;



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