--- parser3/src/targets/apache13/Attic/mod_parser3.c 2003/08/19 14:28:29 1.3 +++ parser3/src/targets/apache13/Attic/mod_parser3.c 2012/03/16 09:24:15 1.13 @@ -1,13 +1,11 @@ /** @file Parser: apache 1.3 module, part, compiled by Apache. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MOD_PARSER3_C="$Date: 2003/08/19 14:28:29 $"; - -#if _MSC_VER +#ifdef WIN32 #include #endif @@ -23,6 +21,8 @@ static const char* IDENT_MOD_PARSER3_C=" #include "pa_httpd.h" +volatile const char * IDENT_MOD_PARSER3_C="$Id: mod_parser3.c,v 1.13 2012/03/16 09:24:15 moko Exp $" IDENT_PA_HTTPD_H; + /* * Declare ourselves so the configuration routines can find and know us. * We'll fill it in at the end of the module. @@ -121,7 +121,7 @@ static int parser_handler(request_rec *a ar->method, ar->headers_out, ar->subprocess_env, - ar->content_type, + &ar->content_type, ar->uri, ar->filename, ar->path_info, @@ -131,7 +131,7 @@ static int parser_handler(request_rec *a // config Parser_module_config *dcfg=our_dconfig(ar); - + return pa_parser_handler(&lr, dcfg); } @@ -143,7 +143,7 @@ static int parser_handler(request_rec *a * There is no return value. */ -static void parser_server_init(server_rec *s, pool *p) { +static void parser_module_init(server_rec *s, pool *p) { #if MODULE_MAGIC_NUMBER >= 19980527 ap_add_version_component(pa_version()); #endif @@ -154,6 +154,22 @@ static void parser_server_init(server_re pa_setup_module_cells(); } +/* + * 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 parser_module_done(server_rec *s, pool *p) { + pa_destroy_module_cells(); +} + /* * This function gets called to create a per-directory configuration * record. This will be called for the "default" server environment, and for @@ -407,7 +423,7 @@ static const handler_rec parser_handlers module MODULE_VAR_EXPORT parser3_module = { STANDARD_MODULE_STUFF, - parser_server_init, /* module initializer */ + parser_module_init, /* module initializer */ parser_create_dir_config, /* per-directory config creator */ parser_merge_dir_config, /* dir config merger */ parser_create_server_config, /* server config creator */ @@ -421,10 +437,22 @@ module MODULE_VAR_EXPORT parser3_module 0, /* [7] MIME type checker/setter */ 0, /* [8] fixups */ 0 /* [10] logger */ +#if MODULE_MAGIC_NUMBER >= 19970103 + ,0 /* [3] header parser */ +#endif +#if MODULE_MAGIC_NUMBER >= 19970719 + ,0 /* process initializer */ +#endif +#if MODULE_MAGIC_NUMBER >= 19970728 + ,parser_module_done /* process exit/cleanup */ +#endif +#if MODULE_MAGIC_NUMBER >= 19970902 + ,0 /* [1] post read_request handling */ +#endif }; #if defined(_MSC_VER) -# define APACHE_WIN32_SRC "/parser3project/win32/apache13/src" +# define APACHE_WIN32_SRC "../../../../win32/apache13/src" # ifdef _DEBUG # pragma comment(lib, APACHE_WIN32_SRC "/CoreD/ApacheCore.lib") # else