cvs commit: apachen/src/main http_main.c

[dgaudet]

dgaudet     97/10/27 11:06:25

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Ensure that at least one copy of config warnings makes it to the error_log.
  
  Reviewed by:  Paul Sutton
  
  Revision  Changes    Path
  1.477     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.476
  retrieving revision 1.477
  diff -u -r1.476 -r1.477
  --- CHANGES   1997/10/26 20:19:14     1.476
  +++ CHANGES   1997/10/27 19:06:21     1.477
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3b3
  +
  +  *) Ensure that one copy of config warnings makes it to the
  +     error_log.  [Dean Gaudet]
  +
     *) Invent new structure and associated methods to handle config file
        reading. Add "custom" hook to use config file cfg_getline() on
        something which is not a FILE*  [Martin Kraemer]
  
  
  
  1.238     +4 -1      apachen/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.237
  retrieving revision 1.238
  diff -u -r1.237 -r1.238
  --- http_main.c       1997/10/22 20:29:40     1.237
  +++ http_main.c       1997/10/27 19:06:23     1.238
  @@ -3390,9 +3390,10 @@
   
       suexec_enabled = init_suexec();
       server_conf = read_config(pconf, ptrans, server_confname);
  -    init_modules(pconf, server_conf);
   
       if (standalone) {
  +     open_logs(server_conf, pconf);
  +     init_modules(pconf, server_conf);
        STANDALONE_MAIN(argc, argv);
       }
       else {
  @@ -3402,6 +3403,8 @@
        BUFF *cio;
        NET_SIZE_T l;
   
  +     /* Yes this is called twice. */
  +     init_modules(pconf, server_conf);
        open_logs(server_conf, pconf);
        init_modules(pconf, server_conf);
        set_group_privs();