mod_env/8254: Backport of part fix for PR#7528

[Gary Benson <gb...@redhat.com>]

>Number:         8254
>Category:       mod_env
>Synopsis:       Backport of part fix for PR#7528
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    apache
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   apache
>Arrival-Date:   Tue Aug 28 10:00:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     gbenson@redhat.com
>Release:        1.3.20
>Organization:
apache
>Environment:
N/A
>Description:
PR#7528 states that "UnsetEnv does not work from main body of httpd.conf". This has been fixed in httpd-2.0 (httpd-2.0/modules/metadata/mod_env.c, revision 1.24). I've backported it to 1.3.20, mainly to stop httpd-test from failing.
>How-To-Repeat:

>Fix:
--- apache_1.3.20/src/modules/standard/mod_env.c-orig	Mon Jan 15 17:05:41 2001
+++ apache_1.3.20/src/modules/standard/mod_env.c	Tue Aug 28 15:10:39 2001
@@ -218,6 +218,15 @@
     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;
 }
 
>Release-Note:
>Audit-Trail:
>Unformatted:
 [In order for any reply to be added to the PR database, you need]
 [to include <ap...@Apache.Org> in the Cc line and make sure the]
 [subject line starts with the report component and number, with ]
 [or without any 'Re:' prefixes (such as "general/1098:" or      ]
 ["Re: general/1098:").  If the subject doesn't match this       ]
 [pattern, your message will be misfiled and ignored.  The       ]
 ["apbugs" address is not added to the Cc line of messages from  ]
 [the database automatically because of the potential for mail   ]
 [loops.  If you do not include this Cc, your reply may be ig-   ]
 [nored unless you are responding to an explicit request from a  ]
 [developer.  Reply only with text; DO NOT SEND ATTACHMENTS!     ]