Mailing List Archive

dgaudet 97/06/28 15:12:56

Modified: src http_config.c http_config.h http_main.c
Log:
The 1.2.1 slack changes included a reordering of the opening of logs and
sockets. Merge this reordering back up into 1.3.

Revision Changes Path
1.51 +8 -3 apache/src/http_config.c

Index: http_config.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C3 -r1.50 -r1.51
*** http_config.c 1997/06/21 22:27:10 1.50
--- http_config.c 1997/06/28 22:12:53 1.51
***************
*** 1097,1103 ****
server_rec *read_config(pool *p, pool *ptemp, char *confname)
{
server_rec *s = init_server_config(p);
- module *m;

init_config_globals(p);

--- 1097,1102 ----
***************
*** 1109,1120 ****

fixup_virtual_hosts (p, s);
default_listeners (p, s);

for (m = top_module; m; m = m->next)
if (m->init)
(*m->init) (s, p);
-
- return s;
}

/********************************************************************
--- 1108,1125 ----

fixup_virtual_hosts (p, s);
default_listeners (p, s);
+
+ return s;
+ }

+
+ void init_modules(pool *p, server_rec *s)
+ {
+ module *m;
+
for (m = top_module; m; m = m->next)
if (m->init)
(*m->init) (s, p);
}

/********************************************************************



1.32 +1 -0 apache/src/http_config.h

Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** http_config.h 1997/06/28 21:49:23 1.31
--- http_config.h 1997/06/28 22:12:54 1.32
***************
*** 261,266 ****
--- 261,267 ----
/* For http_main.c... */

server_rec *read_config (pool *conf_pool, pool *temp_pool, char *config_name);
+ void init_modules(pool *p, server_rec *s);
void setup_prelinked_modules();
void show_directives();
void show_modules();



1.162 +18 -14 apache/src/http_main.c

Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -C3 -r1.161 -r1.162
*** http_main.c 1997/06/27 08:13:14 1.161
--- http_main.c 1997/06/28 22:12:54 1.162
***************
*** 2361,2380 ****
ptrans = make_sub_pool (pconf);

server_conf = read_config (pconf, ptrans, server_confname);
- open_logs (server_conf, pconf);
- set_group_privs ();
- accept_mutex_init (pconf);
- if (!is_graceful) {
- reinit_scoreboard(pconf);
- }
- #ifdef SCOREBOARD_FILE
- else {
- scoreboard_fname = server_root_relative (pconf, scoreboard_fname);
- note_cleanups_for_fd (pconf, scoreboard_fd);
- }
- #endif
-
- default_server_hostnames (server_conf);

listenmaxfd = -1;
FD_ZERO (&listenfds);
--- 2361,2366 ----
***************
*** 2391,2396 ****
--- 2377,2398 ----
}
close_unused_listeners ();

+ init_modules (pconf, server_conf);
+ open_logs (server_conf, pconf);
+ set_group_privs ();
+ accept_mutex_init (pconf);
+ if (!is_graceful) {
+ reinit_scoreboard(pconf);
+ }
+ #ifdef SCOREBOARD_FILE
+ else {
+ scoreboard_fname = server_root_relative (pconf, scoreboard_fname);
+ note_cleanups_for_fd (pconf, scoreboard_fd);
+ }
+ #endif
+
+ default_server_hostnames (server_conf);
+
set_signals ();
log_pid (pconf, pid_fname);

***************
*** 2598,2603 ****
--- 2600,2606 ----

suexec_enabled = init_suexec();
server_conf = read_config (pconf, ptrans, server_confname);
+ init_modules (pconf, server_conf);

if(standalone) {
clear_pool (pconf); /* standalone_main rereads... */
***************
*** 3482,3487 ****
--- 3485,3491 ----
setup_prelinked_modules();

server_conf = read_config (pconf, ptrans, server_confname);
+ init_modules (pconf, server_conf);
suexec_enabled = init_suexec();
open_logs(server_conf, pconf);
set_group_privs();