httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_env.c
Date Wed, 12 Sep 2001 15:16:43 GMT
jim         01/09/12 08:16:43

  Modified:    .        STATUS
               src      CHANGES
               src/modules/standard mod_env.c
  Log:
  PR:8254
  Submitted by:	Gary Benson <gbenson@redhat.com>
  
  Revision  Changes    Path
  1.954     +2 -2      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.953
  retrieving revision 1.954
  diff -u -r1.953 -r1.954
  --- STATUS	2001/09/11 03:29:10	1.953
  +++ STATUS	2001/09/12 15:16:41	1.954
  @@ -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.
  
  
  
  1.1707    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1706
  retrieving revision 1.1707
  diff -u -r1.1706 -r1.1707
  --- CHANGES	2001/09/11 03:29:10	1.1706
  +++ CHANGES	2001/09/12 15:16:41	1.1707
  @@ -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]
   
  
  
  
  1.33      +9 -0      apache-1.3/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_env.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_env.c	2001/01/15 17:05:41	1.32
  +++ mod_env.c	2001/09/12 15:16:43	1.33
  @@ -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;
   }
   
  
  
  

Mime
View raw message