Received: (from majordom@localhost) by hyperreal.org (8.8.5/8.8.5) id GAA10630; Mon, 18 Aug 1997 06:12:33 -0700 (PDT) Received: (from coar@localhost) by hyperreal.org (8.8.5/8.8.5) id GAA10624 for apache-cvs; Mon, 18 Aug 1997 06:12:31 -0700 (PDT) Date: Mon, 18 Aug 1997 06:12:31 -0700 (PDT) From: Rodent of Unusual Size Message-Id: <199708181312.GAA10624@hyperreal.org> To: apache-cvs@hyperreal.org Subject: cvs commit: apachen/src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_expires.c mod_headers.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_setenvif.c mod_status.c mod_userdir.c mod_usertrack.c Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org coar 97/08/18 06:12:30 Modified: src/modules/example mod_example.c src/modules/proxy mod_proxy.c src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_autoindex.c mod_cern_meta.c mod_cgi.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_expires.c mod_headers.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_mime_magic.c mod_negotiation.c mod_rewrite.c mod_setenvif.c mod_status.c mod_userdir.c mod_usertrack.c Log: Add the post read-request phase placeholder to the structures in the standard modules. PR: 1009 Revision Changes Path 1.14 +52 -1 apachen/src/modules/example/mod_example.c Index: mod_example.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/example/mod_example.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_example.c 1997/07/28 18:23:27 1.13 +++ mod_example.c 1997/08/18 13:12:05 1.14 @@ -702,6 +702,33 @@ trace_add (s, NULL, NULL, note); } +/* + * This function is called when an heavy-weight process (such as a child) is + * being run down or destroyed. As with the child-initialisation function, + * any information that needs to be recorded must be in static cells, since + * there's no configuration record. + * + * There is no return value. + */ + +/* + * All our process-death routine does is add its trace to the log. + */ +static void example_child_exit + (server_rec *s, pool *p) { + + char *note; + char *sname = s->server_hostname; + + /* + * The arbitrary text we add to our trace entry indicates for which server + * we're being called. + */ + sname = (sname != NULL) ? sname : ""; + note = pstrcat (p, "example_child_exit(", sname, ")", NULL); + trace_add (s, NULL, NULL, note); +} + /* * This function gets called to create up a per-directory configuration * record. This will be called for the "default" server environment, and for @@ -888,6 +915,29 @@ } /* + * This routine is called after the request has been read but before any other + * phases have been processed. This allows us to make decisions based upon + * the input header fields. + * + * The return value is OK, DECLINED, or HTTP_mumble. If we return OK, no + * further modules are called for this phase. + */ +static int example_post_readreq + (request_rec *r) { + + example_config + *cfg; + + cfg = our_dconfig (r); + /* + * We don't actually *do* anything here, except note the fact that we were + * called. + */ + trace_add (r->server, r, cfg, "example_post_readreq()"); + return DECLINED; +} + +/* * This routine gives our module an opportunity to translate the URI into an * actual filename. If we don't do anything special, the server's default * rules (Alias directives and the like) will continue to be followed. @@ -1139,5 +1189,6 @@ example_logger, /* [9] logger */ example_hparser, /* [2] header parser */ example_child_init, /* process initializer */ - NULL /* process exit/cleanup */ + example_child_exit, /* process exit/cleanup */ + example_post_readreq /* ? */ }; 1.22 +2 -2 apachen/src/modules/proxy/mod_proxy.c Index: mod_proxy.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_proxy.c 1997/08/01 04:58:01 1.21 +++ mod_proxy.c 1997/08/18 13:12:06 1.22 @@ -756,6 +756,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; - 1.23 +2 -1 apachen/src/modules/standard/mod_access.c Index: mod_access.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_access.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_access.c 1997/07/30 18:41:53 1.22 +++ mod_access.c 1997/08/18 13:12:07 1.23 @@ -368,5 +368,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.16 +2 -1 apachen/src/modules/standard/mod_actions.c Index: mod_actions.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_actions.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_actions.c 1997/07/28 18:22:48 1.15 +++ mod_actions.c 1997/08/18 13:12:08 1.16 @@ -217,5 +217,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.23 +2 -1 apachen/src/modules/standard/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_alias.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_alias.c 1997/07/28 18:22:49 1.22 +++ mod_alias.c 1997/08/18 13:12:08 1.23 @@ -387,5 +387,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.18 +2 -1 apachen/src/modules/standard/mod_asis.c Index: mod_asis.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_asis.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_asis.c 1997/07/28 18:22:50 1.17 +++ mod_asis.c 1997/08/18 13:12:08 1.18 @@ -128,5 +128,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.24 +2 -1 apachen/src/modules/standard/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mod_auth.c 1997/07/28 18:22:50 1.23 +++ mod_auth.c 1997/08/18 13:12:08 1.24 @@ -298,5 +298,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.23 +2 -1 apachen/src/modules/standard/mod_auth_anon.c Index: mod_auth_anon.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_anon.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_auth_anon.c 1997/07/28 18:22:51 1.22 +++ mod_auth_anon.c 1997/08/18 13:12:09 1.23 @@ -297,5 +297,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.19 +2 -1 apachen/src/modules/standard/mod_auth_db.c Index: mod_auth_db.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mod_auth_db.c 1997/07/28 18:22:51 1.18 +++ mod_auth_db.c 1997/08/18 13:12:09 1.19 @@ -301,5 +301,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.24 +2 -1 apachen/src/modules/standard/mod_auth_dbm.c Index: mod_auth_dbm.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mod_auth_dbm.c 1997/08/18 06:05:36 1.23 +++ mod_auth_dbm.c 1997/08/18 13:12:09 1.24 @@ -321,5 +321,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.25 +2 -1 apachen/src/modules/standard/mod_auth_msql.c Index: mod_auth_msql.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_msql.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mod_auth_msql.c 1997/07/27 01:43:23 1.24 +++ mod_auth_msql.c 1997/08/18 13:12:10 1.25 @@ -993,5 +993,6 @@ NULL, /* pre-run fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* post read-request */ }; 1.45 +2 -1 apachen/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mod_autoindex.c 1997/07/28 18:22:53 1.44 +++ mod_autoindex.c 1997/08/18 13:12:10 1.45 @@ -1107,5 +1107,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.17 +2 -1 apachen/src/modules/standard/mod_cern_meta.c Index: mod_cern_meta.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_cern_meta.c 1997/07/28 18:22:54 1.16 +++ mod_cern_meta.c 1997/08/18 13:12:10 1.17 @@ -323,5 +323,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.54 +2 -1 apachen/src/modules/standard/mod_cgi.c Index: mod_cgi.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- mod_cgi.c 1997/08/09 11:52:06 1.53 +++ mod_cgi.c 1997/08/18 13:12:11 1.54 @@ -563,5 +563,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.20 +2 -1 apachen/src/modules/standard/mod_digest.c Index: mod_digest.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_digest.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_digest.c 1997/07/28 18:22:55 1.19 +++ mod_digest.c 1997/08/18 13:12:11 1.20 @@ -361,5 +361,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.40 +2 -1 apachen/src/modules/standard/mod_dir.c Index: mod_dir.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_dir.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mod_dir.c 1997/07/28 18:22:56 1.39 +++ mod_dir.c 1997/08/18 13:12:11 1.40 @@ -211,5 +211,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.11 +2 -1 apachen/src/modules/standard/mod_dld.c Index: mod_dld.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_dld.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_dld.c 1997/07/28 18:22:56 1.10 +++ mod_dld.c 1997/08/18 13:12:11 1.11 @@ -188,5 +188,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.15 +2 -1 apachen/src/modules/standard/mod_env.c Index: mod_env.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_env.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_env.c 1997/07/28 18:22:56 1.14 +++ mod_env.c 1997/08/18 13:12:12 1.15 @@ -259,5 +259,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.16 +2 -1 apachen/src/modules/standard/mod_expires.c Index: mod_expires.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_expires.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_expires.c 1997/08/02 00:58:28 1.15 +++ mod_expires.c 1997/08/18 13:12:12 1.16 @@ -483,5 +483,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.9 +2 -1 apachen/src/modules/standard/mod_headers.c Index: mod_headers.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_headers.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_headers.c 1997/07/28 18:22:58 1.8 +++ mod_headers.c 1997/08/18 13:12:12 1.9 @@ -251,5 +251,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.29 +2 -1 apachen/src/modules/standard/mod_imap.c Index: mod_imap.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_imap.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mod_imap.c 1997/08/01 03:53:22 1.28 +++ mod_imap.c 1997/08/18 13:12:12 1.29 @@ -839,5 +839,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.47 +19 -18 apachen/src/modules/standard/mod_include.c Index: mod_include.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_include.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_include.c 1997/07/28 18:22:59 1.46 +++ mod_include.c 1997/08/18 13:12:13 1.47 @@ -2034,22 +2034,23 @@ }; module includes_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - create_includes_dir_config, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - NULL, /* server config */ - NULL, /* merge server config */ - includes_cmds, /* command table */ - includes_handlers, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL /* child_exit */ + STANDARD_MODULE_STUFF, + NULL, /* initializer */ + create_includes_dir_config, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + NULL, /* server config */ + NULL, /* merge server config */ + includes_cmds, /* command table */ + includes_handlers, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ + NULL, /* check access */ + NULL, /* type_checker */ + NULL, /* fixups */ + NULL, /* logger */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.25 +19 -18 apachen/src/modules/standard/mod_info.c Index: mod_info.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_info.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mod_info.c 1997/07/28 18:22:59 1.24 +++ mod_info.c 1997/08/18 13:12:13 1.25 @@ -500,22 +500,23 @@ }; module MODULE_VAR_EXPORT info_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - NULL, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - create_info_config, /* server config */ - merge_info_config, /* merge server config */ - info_cmds, /* command table */ - info_handlers, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL /* child_exit */ + STANDARD_MODULE_STUFF, + NULL, /* initializer */ + NULL, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + create_info_config, /* server config */ + merge_info_config, /* merge server config */ + info_cmds, /* command table */ + info_handlers, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ + NULL, /* check access */ + NULL, /* type_checker */ + NULL, /* fixups */ + NULL, /* logger */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.16 +2 -1 apachen/src/modules/standard/mod_log_agent.c Index: mod_log_agent.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_agent.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_log_agent.c 1997/07/28 18:23:00 1.15 +++ mod_log_agent.c 1997/08/18 13:12:14 1.16 @@ -200,5 +200,6 @@ agent_log_transaction, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.35 +2 -1 apachen/src/modules/standard/mod_log_config.c Index: mod_log_config.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_config.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mod_log_config.c 1997/07/28 18:23:01 1.34 +++ mod_log_config.c 1997/08/18 13:12:14 1.35 @@ -791,5 +791,6 @@ multi_log_transaction, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.16 +2 -1 apachen/src/modules/standard/mod_log_referer.c Index: mod_log_referer.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_referer.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_log_referer.c 1997/07/28 18:23:01 1.15 +++ mod_log_referer.c 1997/08/18 13:12:14 1.16 @@ -238,5 +238,6 @@ referer_log_transaction, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.23 +2 -1 apachen/src/modules/standard/mod_mime.c Index: mod_mime.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_mime.c 1997/07/28 18:23:01 1.22 +++ mod_mime.c 1997/08/18 13:12:15 1.23 @@ -326,5 +326,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.11 +19 -18 apachen/src/modules/standard/mod_mime_magic.c Index: mod_mime_magic.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_mime_magic.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mod_mime_magic.c 1997/07/28 18:23:02 1.10 +++ mod_mime_magic.c 1997/08/18 13:12:16 1.11 @@ -2531,22 +2531,23 @@ */ module mime_magic_module = { - STANDARD_MODULE_STUFF, - magic_init, /* initializer */ - NULL, /* dir config creator */ - NULL, /* dir merger --- default is to override */ - create_magic_server_config, /* server config */ - merge_magic_server_config, /* merge server config */ - mime_magic_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - magic_find_ct, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL /* child_exit */ + STANDARD_MODULE_STUFF, + magic_init, /* initializer */ + NULL, /* dir config creator */ + NULL, /* dir merger --- default is to override */ + create_magic_server_config, /* server config */ + merge_magic_server_config, /* merge server config */ + mime_magic_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ + NULL, /* check access */ + magic_find_ct, /* type_checker */ + NULL, /* fixups */ + NULL, /* logger */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL /* child_exit */ + NULL /* post read-request */ }; 1.54 +2 -1 apachen/src/modules/standard/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_negotiation.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- mod_negotiation.c 1997/07/28 18:23:03 1.53 +++ mod_negotiation.c 1997/08/18 13:12:16 1.54 @@ -2050,5 +2050,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.48 +2 -1 apachen/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mod_rewrite.c 1997/08/18 07:09:20 1.47 +++ mod_rewrite.c 1997/08/18 13:12:17 1.48 @@ -214,7 +214,8 @@ NULL, /* [#9] log a transaction */ NULL, /* [#3] header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; /* the cache */ 1.7 +3 -3 apachen/src/modules/standard/mod_setenvif.c Index: mod_setenvif.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_setenvif.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_setenvif.c 1997/08/18 08:08:47 1.6 +++ mod_setenvif.c 1997/08/18 13:12:18 1.7 @@ -349,8 +349,8 @@ NULL, /* type_checker */ NULL, /* fixups */ NULL, /* logger */ - NULL, /* browser parse */ - NULL, /* child_init */ - NULL, /* child_exit */ + NULL, /* input header parse */ + NULL, /* child (process) initialization */ + NULL, /* child (process) rundown */ match_headers /* post_read_request */ }; 1.60 +2 -1 apachen/src/modules/standard/mod_status.c Index: mod_status.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mod_status.c 1997/08/10 13:31:59 1.59 +++ mod_status.c 1997/08/18 13:12:18 1.60 @@ -679,5 +679,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.21 +2 -1 apachen/src/modules/standard/mod_userdir.c Index: mod_userdir.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_userdir.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_userdir.c 1997/07/28 18:23:05 1.20 +++ mod_userdir.c 1997/08/18 13:12:18 1.21 @@ -339,5 +339,6 @@ NULL, /* logger */ NULL, /* header parser */ NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* child_exit */ + NULL /* post read-request */ }; 1.17 +18 -17 apachen/src/modules/standard/mod_usertrack.c Index: mod_usertrack.c =================================================================== RCS file: /export/home/cvs/apachen/src/modules/standard/mod_usertrack.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_usertrack.c 1997/08/02 00:58:28 1.16 +++ mod_usertrack.c 1997/08/18 13:12:18 1.17 @@ -324,21 +324,22 @@ module MODULE_VAR_EXPORT usertrack_module = { STANDARD_MODULE_STUFF, - NULL, /* initializer */ - make_cookie_dir, /* dir config creater */ - NULL, /* dir merger --- default is to override */ - make_cookie_log_state, /* server config */ - NULL, /* merge server configs */ - cookie_log_cmds, /* command table */ - NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - spot_cookie, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL /* child_exit */ + NULL, /* initializer */ + make_cookie_dir, /* dir config creater */ + NULL, /* dir merger --- default is to override */ + make_cookie_log_state, /* server config */ + NULL, /* merge server configs */ + cookie_log_cmds, /* command table */ + NULL, /* handlers */ + NULL, /* filename translation */ + NULL, /* check_user_id */ + NULL, /* check auth */ + NULL, /* check access */ + NULL, /* type_checker */ + spot_cookie, /* fixups */ + NULL, /* logger */ + NULL, /* header parser */ + NULL, /* child_init */ + NULL, /* child_exit */ + NULL /* post read-request */ };