From: Graham Leggett <minfrin@apache.org>
Date: Tue, 19 Oct 2010 23:46:29 +0000 (+0000)
Subject: Simplify the initialisation before mod_env's fixup.
X-Git-Tag: 2.3.9~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4009e52304734d95c6fa63a0577c935ed8b1ce9c;p=apache

Simplify the initialisation before mod_env's fixup.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024467 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 8bd07327e3..38932d84c6 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -149,15 +149,15 @@ AP_INIT_ITERATE("UnsetEnv", add_env_module_vars_unset, NULL,
 
 static int fixup_env_module(request_rec *r)
 {
-    apr_table_t *e = r->subprocess_env;
     env_dir_config_rec *sconf = ap_get_module_config(r->per_dir_config,
                                                      &env_module);
-    apr_table_t *vars = sconf->vars;
 
-    if (!apr_table_elts(sconf->vars)->nelts)
+    if (!apr_table_elts(sconf->vars)->nelts) {
         return DECLINED;
+    }
 
-    r->subprocess_env = apr_table_overlay(r->pool, e, vars);
+    r->subprocess_env = apr_table_overlay(r->pool, r->subprocess_env,
+            sconf->vars);
 
     return OK;
 }