httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rodent of Unusual Size <c...@hyperreal.org>
Subject cvs commit: apachen/src/modules/standard mod_setenvif.c
Date Mon, 25 Aug 1997 15:39:22 GMT
coar        97/08/25 08:39:21

  Modified:    src/modules/standard mod_setenvif.c
  Log:
  	Revert the UnSetIfZero directive that was added when mod_setenvif
  	was made a standard module.  It isn't broad enough in scope; it
  	only affects those envariables set with the SetEnvIf* directives.
  
  Reviewed by:	Dean Gaudet
  
  Revision  Changes    Path
  1.8       +1 -17     apachen/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_setenvif.c	1997/08/18 13:12:18	1.7
  +++ mod_setenvif.c	1997/08/25 15:39:20	1.8
  @@ -123,7 +123,6 @@
   
   typedef struct {
       array_header *conditionals;
  -    int zero_means_unset;
   } sei_cfg_rec;
   
   module MODULE_VAR_EXPORT setenvif_module;
  @@ -133,7 +132,6 @@
       sei_cfg_rec *new = (sei_cfg_rec *)palloc(p, sizeof(sei_cfg_rec));
   
       new->conditionals = make_array(p, 20, sizeof(sei_entry));
  -    new->zero_means_unset = 0;
       return (void *)new;
   }
   
  @@ -145,7 +143,6 @@
   
       a->conditionals = append_arrays(p, base->conditionals, 
   				    overrides->conditionals);
  -    a->zero_means_unset = overrides->zero_means_unset;
       return a;
   }
   
  @@ -259,9 +256,6 @@
       RSRC_CONF, RAW_ARGS, "A header-name, regex and a list of variables." },
   { "SetEnvIfNoCase", add_setenvif, (void *)REG_ICASE,
       RSRC_CONF, RAW_ARGS, "a header-name, regex and a list of variables." },
  -{ "UnSetEnvIfZero", set_flag_slot,
  -    (void *)XtOffsetOf(sei_cfg_rec,zero_means_unset),
  -    RSRC_CONF, FLAG, "On or Off" },
   { "BrowserMatch", add_browser, (void *)0,
       RSRC_CONF, ITERATE2, "A browser regex and a list of variables." },
   { "BrowserMatchNoCase", add_browser, (void *)REG_ICASE,
  @@ -310,21 +304,11 @@
   	    elts = (table_entry *)b->features->elts;
   
   	    for (j = 0; j < b->features->nelts; ++j) {
  -		if ((!strcmp(elts[j].val, "!")) ||
  -		    (sconf->zero_means_unset && (!strcmp(elts[j].val, "0")))) {
  -
  +		if (!strcmp(elts[j].val, "!")) {
   		    table_unset(r->subprocess_env, elts[j].key);
  -#ifdef SETENV_DEBUG
  -		    log_printf(r->server, "mod_setenvif: unsetting %s",
  -			       elts[j].key);
  -#endif
   		}
   		else {
   		    table_set(r->subprocess_env, elts[j].key, elts[j].val);
  -#ifdef SETENV_DEBUG
  -		    log_printf(r->server, "mod_setenvif: setting %s to %s",
  -			       elts[j].key, elts[j].val);
  -#endif
   		}
   	    }
   	}
  
  
  

Mime
View raw message