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

trawick · trawick · commit 7ad12887d8d0 · 2003-12-04T06:31:01.000Z
mod_include. PR: 24734 Submitted by: Markus Julen <mj zermatt.net> Reviewed by: trawick, nd, striker git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101979 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) Fix a problem with the display of empty variables ("SetEnv foo") in
+     mod_include.  PR 24734  [Markus Julen <mj zermatt.net>]
+
   *) mod_log_config: Log the minutes component of the timezone correctly.
      PR 23642.  [Hong-Gunn Chew <hgbug gunnet.org>]
 
diff --git a/STATUS b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/03 21:38:55 $]
+Last modified at [$Date: 2003/12/04 06:31:01 $]
 
 Release:
 
@@ -355,11 +355,7 @@ PATCHES TO BACKPORT FROM 2.1
 	  bnicholes (looks good on Netware but then NetWare does not
 	             use shared memory.)
 
-    * Fix display of empty variables via mod_include.  PR 24734.
-        modules/metadata/mod_env.c r1.31
-      +1: trawick, nd, striker
-
-    * Fix htdbm to generate comment fields in the DBM files correctly.
+     * Fix htdbm to generate comment fields in the DBM files correctly.
       (This causes DBMAuthGroupFile to break)
         support/htdbm.c r1.11
       +1: jerenkrantz, striker, trawick
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ static const char add_env_module_vars_set(cmd_parms cmd, void *sconf_,`
`158`	`158`	`/* name is mandatory, value is optional. no value means`
`159`	`159`	`* set the variable to an empty string`
`160`	`160`	`*/`
`161`		`- apr_table_setn(sconf->vars, name, value);`
	`161`	`+ apr_table_setn(sconf->vars, name, value ? value : "");`
`162`	`162`
`163`	`163`	`return NULL;`
`164`	`164`	`}`