Received: (from majordom@localhost) by hyperreal.org (8.8.5/8.8.5) id LAA27168; Mon, 28 Jul 1997 11:23:35 -0700 (PDT) Received: (from dougm@localhost) by hyperreal.org (8.8.5/8.8.5) id LAA27148 for apache-cvs; Mon, 28 Jul 1997 11:23:31 -0700 (PDT) Date: Mon, 28 Jul 1997 11:23:31 -0700 (PDT) From: Doug MacEachern Message-Id: <199707281823.LAA27148@hyperreal.org> To: apache-cvs@hyperreal.org Subject: cvs commit: apache/src/modules/proxy mod_proxy.c Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org dougm 97/07/28 11:23:30 Modified: src CHANGES http_config.c http_config.h http_core.c http_main.c 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_autoindex.c mod_browser.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_status.c mod_userdir.c mod_usertrack.c src/modules/example mod_example.c src/modules/proxy mod_proxy.c Log: added child_exit hook for modules Submitted by: Doug MacEachern Reviewed by: Dean Gaudet Revision Changes Path 1.370 +6 -1 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- CHANGES 1997/07/28 08:46:41 1.369 +++ CHANGES 1997/07/28 18:22:40 1.370 @@ -1,5 +1,10 @@ Changes with Apache 1.3a2 + *) API: Added child_exit function to module structure. This is called + once per "heavy-weight process" just before a server child exit()'s + e.g. when max_requests_per_child is reached, etc. + [Doug MacEachern, Dean Gaudet] + *) mod_include cleanup showed that handle_else was being used to handle endif. It didn't cause problems, but it was cleaned up too. [Howard Fear] @@ -390,7 +395,7 @@ *) Fixed open timestamp fd in proxy_cache.c [Chuck Murcko] *) Added undocumented perl SSI mechanism for -DUSE_PERL_SSI and mod_perl. - [Rob Hartill] + [Doug MacEachern, Rob Hartill] *) Proxy needs to use hard_timeout instead of soft_timeout when it is reading from one buffer and writing to another, at least until it has 1.68 +18 -0 apache/src/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- http_config.c 1997/07/27 03:13:30 1.67 +++ http_config.c 1997/07/28 18:22:42 1.68 @@ -1242,6 +1242,24 @@ (*m->child_init) (s, p); } +void child_exit_modules(pool *p, server_rec *s) +{ + module *m; + +#ifdef SIGHUP + signal (SIGHUP, SIG_IGN); +#endif +#ifdef SIGUSR1 + signal (SIGUSR1, SIG_IGN); +#endif + + for (m = top_module; m; m = m->next) + if (m->child_exit) + (*m->child_exit) (s, p); + + exit(0); +} + /******************************************************************** * Configuration directives are restricted in terms of where they may * appear in the main configuration files and/or .htaccess files according 1.41 +8 -1 apache/src/http_config.h Index: http_config.h =================================================================== RCS file: /export/home/cvs/apache/src/http_config.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- http_config.h 1997/07/21 05:53:42 1.40 +++ http_config.h 1997/07/28 18:22:43 1.41 @@ -233,6 +233,12 @@ #else void (*child_init)(server_rec *, pool *); #endif +#ifdef ULTRIX_BRAIN_DEATH + void (*child_exit)(); +#else + void (*child_exit)(server_rec *, pool *); +#endif + } module; /* Initializer for the first few module slots, which are only @@ -242,7 +248,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970719 +#define MODULE_MAGIC_NUMBER 19970728 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific @@ -282,6 +288,7 @@ server_rec *read_config (pool *conf_pool, pool *temp_pool, char *config_name); void init_modules(pool *p, server_rec *s); void child_init_modules(pool *p, server_rec *s); +void child_exit_modules(pool *p, server_rec *s); void setup_prelinked_modules(void); void show_directives(void); void show_modules(void); 1.101 +2 -1 apache/src/http_core.c Index: http_core.c =================================================================== RCS file: /export/home/cvs/apache/src/http_core.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- http_core.c 1997/07/24 04:38:09 1.100 +++ http_core.c 1997/07/28 18:22:44 1.101 @@ -1454,5 +1454,6 @@ NULL, /* pre-run fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.190 +15 -14 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- http_main.c 1997/07/28 11:02:31 1.189 +++ http_main.c 1997/07/28 18:22:47 1.190 @@ -1473,9 +1473,17 @@ exit(1); } +/***************************************************************** + * Connection structures and accounting... + * Should these be global? Only to this file, at least... + */ + +pool *pconf; /* Pool for config stuff */ +pool *ptrans; /* Pool for per-transaction stuff */ + void just_die(int sig) /* SIGHUP to child process??? */ { - exit (0); + child_exit_modules(pconf, server_conf); } static int deferred_die; @@ -1670,13 +1678,6 @@ return (suexec_enabled); } -/***************************************************************** - * Connection structures and accounting... - * Should these be global? Only to this file, at least... - */ - -pool *pconf; /* Pool for config stuff */ -pool *ptrans; /* Pool for per-transaction stuff */ static server_rec *find_virtual_server (struct in_addr server_ip, unsigned port, server_rec *server) @@ -2209,12 +2210,12 @@ sync_scoreboard_image(); if (scoreboard_image->global.exit_generation >= generation) - exit(0); + child_exit_modules(pconf, server_conf); if ((max_requests_per_child > 0 && ++requests_this_child >= max_requests_per_child)) { - exit(0); + child_exit_modules(pconf, server_conf); } (void)update_child_status(child_num, SERVER_READY, (request_rec*)NULL); @@ -2256,7 +2257,7 @@ if (csd >= 0 || errno != EINTR) break; if (deferred_die) { /* we didn't get a socket, and we were told to die */ - exit (0); + child_exit_modules(pconf, server_conf); } } @@ -2278,14 +2279,14 @@ signal (SIGUSR1, just_die); if (deferred_die) { /* ok maybe not, see ya later */ - exit (0); + child_exit_modules(pconf, server_conf); } /* or maybe we missed a signal, you never know on systems * without reliable signals */ sync_scoreboard_image(); if (scoreboard_image->global.exit_generation >= generation) - exit(0); + child_exit_modules(pconf, server_conf); } accept_mutex_off(); /* unlock after "accept" */ @@ -2370,7 +2371,7 @@ sync_scoreboard_image(); if (scoreboard_image->global.exit_generation >= generation) { bclose(conn_io); - exit(0); + child_exit_modules(pconf, server_conf); } /* In case we get a graceful restart while we're blocked 1.21 +2 -1 apache/src/mod_access.c Index: mod_access.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_access.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_access.c 1997/07/27 01:43:21 1.20 +++ mod_access.c 1997/07/28 18:22:48 1.21 @@ -280,5 +280,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.15 +2 -1 apache/src/mod_actions.c Index: mod_actions.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_actions.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_actions.c 1997/07/27 01:43:21 1.14 +++ mod_actions.c 1997/07/28 18:22:48 1.15 @@ -216,5 +216,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.22 +2 -1 apache/src/mod_alias.c Index: mod_alias.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_alias.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_alias.c 1997/07/27 01:43:22 1.21 +++ mod_alias.c 1997/07/28 18:22:49 1.22 @@ -386,5 +386,6 @@ fixup_redir, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.17 +2 -1 apache/src/mod_asis.c Index: mod_asis.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_asis.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_asis.c 1997/07/27 02:08:59 1.16 +++ mod_asis.c 1997/07/28 18:22:50 1.17 @@ -127,5 +127,6 @@ NULL, /* pre-run fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.23 +2 -1 apache/src/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_auth.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_auth.c 1997/07/27 01:43:22 1.22 +++ mod_auth.c 1997/07/28 18:22:50 1.23 @@ -297,5 +297,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.22 +2 -1 apache/src/mod_auth_anon.c Index: mod_auth_anon.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_auth_anon.c 1997/07/19 08:02:05 1.21 +++ mod_auth_anon.c 1997/07/28 18:22:51 1.22 @@ -296,5 +296,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.18 +2 -1 apache/src/mod_auth_db.c Index: mod_auth_db.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_auth_db.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mod_auth_db.c 1997/07/27 01:43:22 1.17 +++ mod_auth_db.c 1997/07/28 18:22:51 1.18 @@ -300,5 +300,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.21 +2 -1 apache/src/mod_auth_dbm.c Index: mod_auth_dbm.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_auth_dbm.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_auth_dbm.c 1997/07/27 01:43:23 1.20 +++ mod_auth_dbm.c 1997/07/28 18:22:52 1.21 @@ -293,5 +293,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.44 +2 -1 apache/src/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_autoindex.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- mod_autoindex.c 1997/07/26 12:44:14 1.43 +++ mod_autoindex.c 1997/07/28 18:22:53 1.44 @@ -1106,5 +1106,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.16 +2 -1 apache/src/mod_browser.c Index: mod_browser.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_browser.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_browser.c 1997/07/27 01:43:23 1.15 +++ mod_browser.c 1997/07/28 18:22:54 1.16 @@ -186,5 +186,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.16 +2 -1 apache/src/mod_cern_meta.c Index: mod_cern_meta.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_cern_meta.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_cern_meta.c 1997/07/27 02:38:04 1.15 +++ mod_cern_meta.c 1997/07/28 18:22:54 1.16 @@ -322,5 +322,6 @@ add_cern_meta_data, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.52 +2 -1 apache/src/mod_cgi.c Index: mod_cgi.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_cgi.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- mod_cgi.c 1997/07/27 01:43:24 1.51 +++ mod_cgi.c 1997/07/28 18:22:55 1.52 @@ -562,5 +562,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.19 +2 -1 apache/src/mod_digest.c Index: mod_digest.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_digest.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mod_digest.c 1997/07/19 08:02:06 1.18 +++ mod_digest.c 1997/07/28 18:22:55 1.19 @@ -360,5 +360,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.39 +2 -1 apache/src/mod_dir.c Index: mod_dir.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_dir.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- mod_dir.c 1997/07/17 22:27:35 1.38 +++ mod_dir.c 1997/07/28 18:22:56 1.39 @@ -210,5 +210,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.10 +2 -1 apache/src/mod_dld.c Index: mod_dld.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_dld.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_dld.c 1997/07/27 01:43:24 1.9 +++ mod_dld.c 1997/07/28 18:22:56 1.10 @@ -187,5 +187,6 @@ NULL, /* type_checker */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.14 +2 -1 apache/src/mod_env.c Index: mod_env.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_env.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_env.c 1997/07/27 01:43:24 1.13 +++ mod_env.c 1997/07/28 18:22:56 1.14 @@ -258,5 +258,6 @@ fixup_env_module, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.14 +2 -1 apache/src/mod_expires.c Index: mod_expires.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_expires.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_expires.c 1997/07/27 01:43:25 1.13 +++ mod_expires.c 1997/07/28 18:22:57 1.14 @@ -482,5 +482,6 @@ add_expires, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.8 +2 -1 apache/src/mod_headers.c Index: mod_headers.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_headers.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_headers.c 1997/07/27 01:43:25 1.7 +++ mod_headers.c 1997/07/28 18:22:58 1.8 @@ -250,5 +250,6 @@ fixup_headers, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.27 +2 -1 apache/src/mod_imap.c Index: mod_imap.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_imap.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mod_imap.c 1997/07/27 01:43:25 1.26 +++ mod_imap.c 1997/07/28 18:22:58 1.27 @@ -834,5 +834,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.46 +2 -1 apache/src/mod_include.c Index: mod_include.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_include.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mod_include.c 1997/07/28 08:46:42 1.45 +++ mod_include.c 1997/07/28 18:22:59 1.46 @@ -2050,5 +2050,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.24 +2 -1 apache/src/mod_info.c Index: mod_info.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_info.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mod_info.c 1997/07/27 01:43:26 1.23 +++ mod_info.c 1997/07/28 18:22:59 1.24 @@ -516,5 +516,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.15 +2 -1 apache/src/mod_log_agent.c Index: mod_log_agent.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_log_agent.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_log_agent.c 1997/07/17 22:27:38 1.14 +++ mod_log_agent.c 1997/07/28 18:23:00 1.15 @@ -199,5 +199,6 @@ NULL, /* fixups */ agent_log_transaction, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.34 +2 -1 apache/src/mod_log_config.c Index: mod_log_config.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_log_config.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mod_log_config.c 1997/07/27 01:43:27 1.33 +++ mod_log_config.c 1997/07/28 18:23:01 1.34 @@ -790,5 +790,6 @@ NULL, /* fixups */ multi_log_transaction, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.15 +2 -1 apache/src/mod_log_referer.c Index: mod_log_referer.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_log_referer.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_log_referer.c 1997/07/17 22:27:38 1.14 +++ mod_log_referer.c 1997/07/28 18:23:01 1.15 @@ -237,5 +237,6 @@ NULL, /* fixups */ referer_log_transaction, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.22 +2 -1 apache/src/mod_mime.c Index: mod_mime.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_mime.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_mime.c 1997/07/27 01:43:27 1.21 +++ mod_mime.c 1997/07/28 18:23:01 1.22 @@ -325,5 +325,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.10 +2 -1 apache/src/mod_mime_magic.c Index: mod_mime_magic.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_mime_magic.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_mime_magic.c 1997/07/27 23:04:34 1.9 +++ mod_mime_magic.c 1997/07/28 18:23:02 1.10 @@ -2547,5 +2547,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.53 +2 -1 apache/src/mod_negotiation.c Index: mod_negotiation.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- mod_negotiation.c 1997/07/27 01:43:27 1.52 +++ mod_negotiation.c 1997/07/28 18:23:03 1.53 @@ -2049,5 +2049,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.42 +2 -1 apache/src/mod_rewrite.c Index: mod_rewrite.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- mod_rewrite.c 1997/07/27 02:10:39 1.41 +++ mod_rewrite.c 1997/07/28 18:23:04 1.42 @@ -213,7 +213,8 @@ hook_fixup, /* [#7] pre-run fixups */ NULL, /* [#9] log a transaction */ NULL, /* [#3] header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; /* the cache */ 1.58 +2 -1 apache/src/mod_status.c Index: mod_status.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_status.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- mod_status.c 1997/07/27 18:44:05 1.57 +++ mod_status.c 1997/07/28 18:23:05 1.58 @@ -663,5 +663,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.20 +2 -1 apache/src/mod_userdir.c Index: mod_userdir.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_userdir.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_userdir.c 1997/07/27 01:43:28 1.19 +++ mod_userdir.c 1997/07/28 18:23:05 1.20 @@ -338,5 +338,6 @@ NULL, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.15 +2 -1 apache/src/mod_usertrack.c Index: mod_usertrack.c =================================================================== RCS file: /export/home/cvs/apache/src/mod_usertrack.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_usertrack.c 1997/07/17 22:27:42 1.14 +++ mod_usertrack.c 1997/07/28 18:23:05 1.15 @@ -339,5 +339,6 @@ spot_cookie, /* fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ }; 1.13 +2 -1 apache/src/modules/example/mod_example.c Index: mod_example.c =================================================================== RCS file: /export/home/cvs/apache/src/modules/example/mod_example.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_example.c 1997/07/20 13:18:02 1.12 +++ mod_example.c 1997/07/28 18:23:27 1.13 @@ -1138,5 +1138,6 @@ example_fixer, /* [7] fixups */ example_logger, /* [9] logger */ example_hparser, /* [2] header parser */ - example_child_init /* process initializer */ + example_child_init, /* process initializer */ + NULL /* process exit/cleanup */ }; 1.20 +2 -1 apache/src/modules/proxy/mod_proxy.c Index: mod_proxy.c =================================================================== RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_proxy.c 1997/07/27 01:43:38 1.19 +++ mod_proxy.c 1997/07/28 18:23:29 1.20 @@ -738,6 +738,7 @@ proxy_fixup, /* pre-run fixups */ NULL, /* logger */ NULL, /* header parser */ - NULL /* child_init */ + NULL, /* child_init */ + NULL /* child_exit */ };