cvs commit: apache/src http_config.c http_core.c

[Randy Terbush]

randy       96/08/15 06:56:58

  Modified:    src       http_config.c http_core.c
  Log:
  Oops. User/Group directives in <VirtualHost> were getting reset with
  main server values.
  
  Revision  Changes    Path
  1.19      +3 -0      apache/src/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -C3 -r1.18 -r1.19
  *** http_config.c     1996/08/10 22:12:18     1.18
  --- http_config.c     1996/08/15 13:56:53     1.19
  ***************
  *** 719,724 ****
  --- 719,727 ----
        s->module_config = create_empty_config (p);
        s->lookup_defaults = create_per_dir_config (p);
        
  +     s->server_uid = user_id;
  +     s->server_gid = group_id;
  + 
        return s;
    }
    
  
  
  
  1.30      +0 -3      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -C3 -r1.29 -r1.30
  *** http_core.c       1996/08/08 12:24:49     1.29
  --- http_core.c       1996/08/15 13:56:55     1.30
  ***************
  *** 739,747 ****
        if (s->access_confname)
        process_resource_config (s, s->access_confname, p, ptemp);
        
  -     s->server_uid = user_id;
  -     s->server_gid = group_id;
  -     
        if (errmsg == end_virthost_magic) return NULL;
        return errmsg;
    }
  --- 739,744 ----