Author: mturk
Date: Sat Jan 31 07:40:21 2009
New Revision: 739519
URL: http://svn.apache.org/viewvc?rev=739519&view=rev
Log:
Fix bz46579 by adding the local environment table
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
tomcat/connectors/trunk/jk/native/common/jk_map.h
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=739519&r1=739518&r2=739519&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sat Jan 31 07:40:21 2009
@@ -80,6 +80,7 @@
static void trim_prp_comment(char *prp);
static size_t trim(char *s);
static int map_realloc(jk_map_t *m);
+jk_map_t *jk_environment_map = NULL;
int jk_map_alloc(jk_map_t **m)
{
@@ -710,6 +711,12 @@
if (!env_value) {
env_value = getenv(env_name);
}
+ if (!env_value && jk_environment_map) {
+ /* Search inside local environment table */
+ env_value = jk_map_get_string(jk_environment_map,
+ env_name, NULL);
+ }
+
#if defined(WIN32)
if (!env_value) {
/* Try the env block from calling process */
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.h?rev=739519&r1=739518&r2=739519&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.h Sat Jan 31 07:40:21 2009
@@ -37,6 +37,9 @@
struct jk_map;
typedef struct jk_map jk_map_t;
+/* Local environment table */
+jk_map_t *jk_environment_map;
+
int jk_map_alloc(jk_map_t **m);
int jk_map_free(jk_map_t **m);
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=739519&r1=739518&r2=739519&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sat Jan 31 07:40:21
2009
@@ -2313,8 +2313,9 @@
if ((p = strrchr(fname, '\\'))) {
*(p++) = '\0';
StringCbCopy(dll_file_path, MAX_PATH, fname);
- SetEnvironmentVariable("JKISAPI_PATH", dll_file_path);
- SetEnvironmentVariable("JKISAPI_NAME", p);
+ jk_map_alloc(&jk_environment_map);
+ jk_map_add(jk_environment_map, "JKISAPI_PATH", dll_file_path);
+ jk_map_add(jk_environment_map, "JKISAPI_NAME", p);
}
else {
/* Cannot obtain file name ? */
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=739519&r1=739518&r2=739519&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Jan 31
07:40:21 2009
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>46579</bug>: Use local environment table instead environment
+ variables for setting the JKISAPI_PATH and JKISAPI_NAME. (mturk)
+ </fix>
<add>
Apache: Add more environment variables to overwrite request
information. Useful in case a proxy is in front of Apache and sends
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
