Fix a problem with the display of empty variables ("SetEnv foo") in

mod_include.  Now it works like 1.3 (see PR for details).  Setting
of envvars for scripts was/is consistent with 1.3 for empty variables.

PR:           24734
Submitted by: Markus Julen <mj zermatt.net>
Reviewed by:  Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index d90dfd9a33aad9ac09ff8e5ef49f90d7fee82788..01f4736accbd31281d8e1511985c91f28325e139 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
+
+  *) Fix a problem with the display of empty variables ("SetEnv foo") in
+     mod_include.  PR 24734  [Markus Julen <mj zermatt.net>]
+
   *) Win32 MPM: The bucket brigades subsystem now honors the MaxMemFree setting.
      [Bill Stoddard]
 

diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index ac0250b0f60dbdee8625b2237f56e660811398bc..6a973fc08e2ad5d28a015f770ef88e6b96e6a004 100644 (file)
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -158,7 +158,7 @@ static const char *add_env_module_vars_set(cmd_parms *cmd, void *sconf_,
     /* name is mandatory, value is optional.  no value means
      * set the variable to an empty string
      */
-    apr_table_setn(sconf->vars, name, value);
+    apr_table_setn(sconf->vars, name, value ? value : "");
 
     return NULL;
 }