dgaudet 99/06/19 11:10:12
Modified: mpm/src CHANGES Configuration.mpm mpm/src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c mod_cgi.c mod_imap.c mod_include.c mod_log_config.c mod_negotiation.c mod_setenvif.c mod_userdir.c Log: Port a bunch of modules to the new module structure. (All the ones currently activated in Configuration.mpm plus cgi and include... but I didn't activate those because dynamic content is broken until I fix chunking.) Submitted by: "Michael H. Voase" <[EMAIL PROTECTED]> Revision Changes Path 1.4 +3 -0 apache-2.0/mpm/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CHANGES 1999/06/18 23:34:56 1.3 +++ CHANGES 1999/06/19 18:10:03 1.4 @@ -1,5 +1,8 @@ Changes with MPM + * Port a bunch of modules to the new module structure. + ["Michael H. Voase" <[EMAIL PROTECTED]>] + * I/O layering and BUFF revamp. See docs/buff.txt. [Dean Gaudet] * Basic restructuring to introduce the MPM concept; includes various 1.3 +10 -10 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Configuration.mpm 1999/06/18 19:20:18 1.2 +++ Configuration.mpm 1999/06/19 18:10:03 1.3 @@ -23,28 +23,28 @@ Rule WANTHSREGEX=default # AddModule modules/experimental/mod_mmap_static.o # AddModule modules/standard/mod_env.o -# AddModule modules/standard/mod_log_config.o +AddModule modules/standard/mod_log_config.o # AddModule modules/standard/mod_log_agent.o # AddModule modules/standard/mod_log_referer.o # AddModule modules/standard/mod_mime_magic.o AddModule modules/standard/mod_mime.o -# AddModule modules/standard/mod_negotiation.o +AddModule modules/standard/mod_negotiation.o # AddModule modules/standard/mod_status.o # AddModule modules/standard/mod_info.o # AddModule modules/standard/mod_include.o -# AddModule modules/standard/mod_autoindex.o +AddModule modules/standard/mod_autoindex.o AddModule modules/standard/mod_dir.o # AddModule modules/standard/mod_cgi.o -# AddModule modules/standard/mod_asis.o -# AddModule modules/standard/mod_imap.o +AddModule modules/standard/mod_asis.o +AddModule modules/standard/mod_imap.o # AddModule modules/standard/mod_actions.o # AddModule modules/standard/mod_speling.o -# AddModule modules/standard/mod_userdir.o +AddModule modules/standard/mod_userdir.o # AddModule modules/proxy/libproxy.a -# AddModule modules/standard/mod_alias.o +AddModule modules/standard/mod_alias.o # AddModule modules/standard/mod_rewrite.o -# AddModule modules/standard/mod_access.o -# AddModule modules/standard/mod_auth.o +AddModule modules/standard/mod_access.o +AddModule modules/standard/mod_auth.o # AddModule modules/standard/mod_auth_anon.o # AddModule modules/standard/mod_auth_dbm.o # AddModule modules/standard/mod_auth_db.o @@ -56,4 +56,4 @@ # AddModule modules/example/mod_example.o # AddModule modules/standard/mod_unique_id.o # AddModule modules/standard/mod_so.o -# AddModule modules/standard/mod_setenvif.o +AddModule modules/standard/mod_setenvif.o 1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_access.c Index: mod_access.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_access.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_access.c 1999/06/18 18:39:35 1.1 +++ mod_access.c 1999/06/19 18:10:04 1.2 @@ -388,7 +388,11 @@ module MODULE_VAR_EXPORT access_module = { - STANDARD_MODULE_STUFF, + STANDARD20_MODULE_STUFF, + NULL, /* pre_command */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ NULL, /* initializer */ create_access_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ @@ -404,7 +408,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_actions.c Index: mod_actions.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_actions.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_actions.c 1999/06/18 18:39:35 1.1 +++ mod_actions.c 1999/06/19 18:10:04 1.2 @@ -210,8 +210,12 @@ module action_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ create_action_dir_config, /* dir config creater */ merge_action_dir_configs, /* dir merger --- default is to override */ NULL, /* server config */ @@ -226,7 +230,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_alias.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_alias.c 1999/06/18 18:39:36 1.1 +++ mod_alias.c 1999/06/19 18:10:04 1.2 @@ -396,7 +396,11 @@ module MODULE_VAR_EXPORT alias_module = { - STANDARD_MODULE_STUFF, + STANDARD20_MODULE_STUFF, + NULL, /* pre_command */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ NULL, /* initializer */ create_alias_dir_config, /* dir config creater */ merge_alias_dir_config, /* dir merger --- default is to override */ @@ -412,7 +416,5 @@ fixup_redir, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_asis.c Index: mod_asis.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_asis.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_asis.c 1999/06/18 18:39:36 1.1 +++ mod_asis.c 1999/06/19 18:10:04 1.2 @@ -125,8 +125,12 @@ module MODULE_VAR_EXPORT asis_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initaliser */ NULL, /* create per-directory config structure */ NULL, /* merge per-directory config structures */ NULL, /* create per-server config structure */ @@ -141,7 +145,5 @@ NULL, /* pre-run fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_auth.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_auth.c 1999/06/18 18:39:36 1.1 +++ mod_auth.c 1999/06/19 18:10:05 1.2 @@ -311,7 +311,11 @@ module MODULE_VAR_EXPORT auth_module = { - STANDARD_MODULE_STUFF, + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ NULL, /* initializer */ create_auth_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ @@ -327,7 +331,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_autoindex.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_autoindex.c 1999/06/18 18:39:37 1.1 +++ mod_autoindex.c 1999/06/19 18:10:05 1.2 @@ -1649,8 +1649,12 @@ module MODULE_VAR_EXPORT autoindex_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ create_autoindex_config, /* dir config creater */ merge_autoindex_configs, /* dir merger --- default is to override */ NULL, /* server config */ @@ -1665,7 +1669,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_cgi.c Index: mod_cgi.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_cgi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_cgi.c 1999/06/18 18:39:37 1.1 +++ mod_cgi.c 1999/06/19 18:10:05 1.2 @@ -561,8 +561,12 @@ module MODULE_VAR_EXPORT cgi_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ create_cgi_config, /* server config */ @@ -577,7 +581,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_imap.c Index: mod_imap.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_imap.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_imap.c 1999/06/18 18:39:38 1.1 +++ mod_imap.c 1999/06/19 18:10:06 1.2 @@ -896,8 +896,12 @@ module MODULE_VAR_EXPORT imap_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ create_imap_dir_config, /* dir config creater */ merge_imap_dir_configs, /* dir merger --- default is to override */ NULL, /* server config */ @@ -912,7 +916,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_include.c Index: mod_include.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_include.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_include.c 1999/06/18 18:39:38 1.1 +++ mod_include.c 1999/06/19 18:10:08 1.2 @@ -2466,8 +2466,12 @@ module MODULE_VAR_EXPORT includes_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ create_includes_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ NULL, /* server config */ @@ -2482,7 +2486,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +13 -11 apache-2.0/mpm/src/modules/standard/mod_log_config.c Index: mod_log_config.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_log_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_log_config.c 1999/06/18 18:39:38 1.1 +++ mod_log_config.c 1999/06/19 18:10:08 1.2 @@ -990,7 +990,7 @@ cls->log_fd = ap_piped_log_write_fd(pl); } else { - char *fname = ap_server_root_relative(p, cls->fname); + const char *fname = ap_server_root_relative(p, cls->fname); if ((cls->log_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) < 0) { ap_log_error(APLOG_MARK, APLOG_ERR, s, "could not open transfer log file %s.", fname); @@ -1058,7 +1058,7 @@ return NULL; } -static void init_config_log(server_rec *s, pool *p) +static void init_config_log(pool *pc, pool *p, pool *pt, server_rec *s) { /* First, do "physical" server, which gets default log fd and format * for the virtual servers, if they don't override... @@ -1071,10 +1071,14 @@ for (s = s->next; s; s = s->next) { open_multi_logs(s, p); } +#ifdef BUFFERED_LOGS + /* Now register the last buffer flush with the cleanup engine */ + ap_register_cleanup(p , s, flush_all_logs, flush_all_logs); +#endif } #ifdef BUFFERED_LOGS -static void flush_all_logs(server_rec *s, pool *p) +static void flush_all_logs(server_rec *s) { multi_log_state *mls; array_header *log_list; @@ -1102,8 +1106,12 @@ module MODULE_VAR_EXPORT config_log_module = { - STANDARD_MODULE_STUFF, - init_config_log, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + init_config_log, /* open_logs */ + NULL, /* child_init */ NULL, /* create per-dir config */ NULL, /* merge per-dir config */ make_config_log_state, /* server config */ @@ -1118,11 +1126,5 @@ NULL, /* fixups */ multi_log_transaction, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ -#ifdef BUFFERED_LOGS - flush_all_logs, /* child_exit */ -#else - NULL, -#endif NULL /* post read-request */ }; 1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_negotiation.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_negotiation.c 1999/06/18 18:39:39 1.1 +++ mod_negotiation.c 1999/06/19 18:10:08 1.2 @@ -2726,7 +2726,11 @@ module MODULE_VAR_EXPORT negotiation_module = { - STANDARD_MODULE_STUFF, + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ NULL, /* initializer */ create_neg_dir_config, /* dir config creator */ merge_neg_dir_configs, /* dir merger --- default is to override */ @@ -2742,7 +2746,5 @@ fix_encoding, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ }; 1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_setenvif.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_setenvif.c 1999/06/18 18:39:39 1.1 +++ mod_setenvif.c 1999/06/19 18:10:08 1.2 @@ -401,7 +401,11 @@ module MODULE_VAR_EXPORT setenvif_module = { - STANDARD_MODULE_STUFF, + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ NULL, /* initializer */ NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ @@ -417,7 +421,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* input header parse */ - NULL, /* child (process) initialization */ - NULL, /* child (process) rundown */ match_headers /* post_read_request */ }; 1.2 +6 -4 apache-2.0/mpm/src/modules/standard/mod_userdir.c Index: mod_userdir.c =================================================================== RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_userdir.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_userdir.c 1999/06/18 18:39:39 1.1 +++ mod_userdir.c 1999/06/19 18:10:09 1.2 @@ -327,8 +327,12 @@ } module userdir_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, + NULL, /* pre_command_line */ + NULL, /* pre_config */ + NULL, /* post_config */ + NULL, /* open_logs */ + NULL, /* child initializer */ NULL, /* dir config creater */ NULL, /* dir merger --- default is to override */ create_userdir_config, /* server config */ @@ -343,7 +347,5 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ NULL /* post read-request */ };