From: Jim Jagielski <jim@apache.org>
Date: Wed, 12 Sep 2001 15:16:43 +0000 (+0000)
Subject: PR:8254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2f5886b2d79e5ab4dd23470fde1a5965a44204a;p=thirdparty%2Fapache%2Fhttpd.git

PR:8254
Obtained from:
Submitted by:	Gary Benson <gbenson@redhat.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91009 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 0a19501de6a..c86cd0d2c55 100644
--- a/STATUS
+++ b/STATUS
@@ -1,9 +1,9 @@
 APACHE 1.3 STATUS:						-*-text-*-
-  Last modified at [$Date: 2001/09/11 03:29:10 $]
+  Last modified at [$Date: 2001/09/12 15:16:41 $]
 
 Release:
 
-   1.3.21: In development
+   1.3.21: In development - Bill Stoddard has proposed a T&R "soon"
    1.3.20: Tagged and rolled May 15, 2001. Announced May 21, 2001.
    1.3.19: Tagged and rolled Feb 26, 2001. Announced Mar 01, 2001.
    1.3.18: Not released.
diff --git a/src/CHANGES b/src/CHANGES
index f81b0ffce83..b0a461c12e5 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.21
 
+  *) UnsetEnv from main body of httpd.conf file didn't work; backport
+     of bugfix from 2.0 codebase. [Gary Benson <gbenson@redhat.com>] PR#8254
+
   *) Win32 - add mod_unique_id.so and mod_vhost_alias.so to the build.
      [William Rowe]
 
diff --git a/src/modules/standard/mod_env.c b/src/modules/standard/mod_env.c
index e9a2df28e77..f8c64888a4a 100644
--- a/src/modules/standard/mod_env.c
+++ b/src/modules/standard/mod_env.c
@@ -218,6 +218,15 @@ static const char *add_env_module_vars_unset(cmd_parms *cmd,
     sconf->unsetenv = sconf->unsetenv ?
         ap_pstrcat(cmd->pool, sconf->unsetenv, " ", arg, NULL) :
          arg;
+
+    if (sconf->vars_present && !cmd->path) {
+        /* if {Set,Pass}Env FOO, UnsetEnv FOO
+         * are in the base config, merge never happens,
+         * unset never happens, so just unset now
+         */
+        ap_table_unset(sconf->vars, arg);
+    }
+
     return NULL;
 }