cvs commit: apache-1.3/src/modules/standard mod_setenvif.c

[ben]

ben         98/01/31 06:38:24

  Modified:    src/modules/standard mod_setenvif.c
  Log:
  Make setenvif terminate when it should, instead of by accident, and also
  correctly handle multiple env vars to be set. As a side-effect, eliminate
  an env var with a null name.
  
  Revision  Changes    Path
  1.14      +7 -2      apache-1.3/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_setenvif.c    1998/01/26 19:50:24     1.13
  +++ mod_setenvif.c    1998/01/31 14:38:23     1.14
  @@ -176,7 +176,10 @@
                           cmd->cmd->name, NULL);
           return error;
       }
  -    while ((feature = getword_conf(cmd->pool, &cmdline))) {
  +    for( ; ; ) {
  +     feature = getword_conf(cmd->pool, &cmdline);
  +     if(!*feature)
  +         break;
           beenhere++;
   
           /*
  @@ -196,7 +199,7 @@
                   else {
                       table_set(b->features, var, "1");
                   }
  -                return NULL;
  +             goto next;
               }
           }
   
  @@ -226,6 +229,8 @@
           else {
               table_set(new->features, var, "1");
           }
  +    next:
  +     continue;
       }
   
       if (!beenhere) {