dgaudet 98/03/09 22:30:50
Modified: src CHANGES
src/main util_script.c
Log:
Prior to the existence of mod_setenv it was necessary to tweak the TZ
environment variable in the apache core. But that tweaking interferes
with mod_setenv. So don't tweak if the user has specified an explicit
TZ variable.
PR: 1888
Submitted by: Jay Soffian <[EMAIL PROTECTED]>
Revision Changes Path
1.697 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- CHANGES 1998/03/10 06:13:47 1.696
+++ CHANGES 1998/03/10 06:30:46 1.697
@@ -1,5 +1,10 @@
Changes with Apache 1.3b6
+ *) Prior to the existence of mod_setenv it was necessary to tweak the TZ
+ environment variable in the apache core. But that tweaking interferes
+ with mod_setenv. So don't tweak if the user has specified an explicit
+ TZ variable. [Jay Soffian <[EMAIL PROTECTED]>] PR#1888
+
*) rputs() did not calculate r->sent_bodyct properly.
[Siegmund Stirnweiss <[EMAIL PROTECTED]>] PR#1900
1.100 +5 -3 apache-1.3/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- util_script.c 1998/03/10 05:14:19 1.99
+++ util_script.c 1998/03/10 06:30:49 1.100
@@ -151,9 +151,11 @@
char *whack;
j = 0;
- tz = getenv("TZ");
- if (tz != NULL)
- env[j++] = pstrcat(p, "TZ=", tz, NULL);
+ if (!table_get(t, "TZ")) {
+ tz = getenv("TZ");
+ if (tz != NULL)
+ env[j++] = pstrcat(p, "TZ=", tz, NULL);
+ }
for (i = 0; i < env_arr->nelts; ++i) {
if (!elts[i].key)
continue;
