--- parser3/src/targets/apache/mod_parser3.c	2010/11/22 23:42:09	1.7
+++ parser3/src/targets/apache/mod_parser3.c	2010/11/23 00:27:02	1.11
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/22 23:42:09 $";
+static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/23 00:27:02 $";
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -65,7 +65,7 @@ static Parser_module_config *our_dconfig
 	return (Parser_module_config *) ap_get_module_config(r->per_dir_config, &parser3_module);
 }
 
-static const char* cmd_parser_config(cmd_parms *cmd, void *mconfig, char *file_spec) {
+static const char* cmd_parser_config(cmd_parms *cmd, void *mconfig, const char *file_spec) {
 	Parser_module_config *cfg = (Parser_module_config *) mconfig;
 	cfg->parser_config_filespec=file_spec;
 	return NULL;
@@ -108,7 +108,7 @@ static int parser_handler(request_rec *r
 */
 
 #ifdef STANDARD20_MODULE_STUFF
-static void parser_module_init(apr_pool_t *p, server_rec *s) {
+static void parser_child_init(apr_pool_t *p, server_rec *s) {
 #else
 static void parser_module_init(server_rec *s, apr_pool_t *p) {
 #endif	
@@ -146,14 +146,7 @@ static void *parser_create_server_config
 */
 static const command_rec parser_cmds[] =
 {
-	{
-		"ParserConfig",				/* directive name */
-			(const char* (*)(void))((void *)cmd_parser_config), // config action routine
-			(void*)0,			/* argument to include in call */
-			(int)(OR_OPTIONS),		/* where available */
-			TAKE1,				/* arguments */
-			"Parser config filespec"	// directive description
-	},
+	{"ParserConfig", (const char *(*)())cmd_parser_config, 0, OR_OPTIONS, TAKE1, "Parser config filespec"},
 	{NULL}
 };
 
@@ -181,9 +174,8 @@ static const handler_rec parser_handlers
 */
 static void parser_register_hooks(apr_pool_t* pool)
 {
-//	ap_hook_post_config(parser_server_init, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_handler(parser_handler, NULL, NULL, APR_HOOK_MIDDLE);
-	ap_hook_child_init(parser_module_init, NULL, NULL, APR_HOOK_MIDDLE);
+	ap_hook_child_init(parser_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 };
 
 module AP_MODULE_DECLARE_DATA parser3_module =
@@ -229,21 +221,6 @@ module MODULE_VAR_EXPORT parser3_module
 
 // interface to C++
 
-#define	PA_APLOG_EMERG		0	/* system is unusable */
-#define	PA_APLOG_ALERT		1	/* action must be taken immediately */
-#define	PA_APLOG_CRIT		2	/* critical conditions */
-#define	PA_APLOG_ERR		3	/* error conditions */
-#define	PA_APLOG_WARNING	4	/* warning conditions */
-#define	PA_APLOG_NOTICE		5	/* normal but significant condition */
-#define	PA_APLOG_INFO		6	/* informational */
-#define	PA_APLOG_DEBUG		7	/* debug-level messages */
-
-#define	PA_APLOG_LEVELMASK	7	/* mask off the level value */
-
-#define PA_APLOG_NOERRNO	(PA_APLOG_LEVELMASK + 1)
-
-#define PA_APLOG_MARK	__FILE__,__LINE__
-
 void pa_ap_log_rerror(const char *file, int line, int level, const pa_request_rec *s, const char *fmt, ...) {
 	const char* str;
 	va_list l;
@@ -253,9 +230,9 @@ void pa_ap_log_rerror(const char *file,
 
 	ap_log_rerror(file, line, level,
 #ifdef STANDARD20_MODULE_STUFF
-				0,
+			0,
 #endif
-		      (request_rec*)s->real_request_rec, "%s", str);
+			(request_rec*)s->real_request_rec, "%s", str);
 }
 
 
@@ -268,9 +245,9 @@ void pa_ap_log_error(const char *file, i
 
 	ap_log_error(file, line, level,
 #ifdef STANDARD20_MODULE_STUFF
-				0,
+			0,
 #endif
-		      (server_rec*)s, "%s", str);
+			(server_rec*)s, "%s", str);
 }
 
 // ap_alloc.h
@@ -322,7 +299,7 @@ int pa_ap_rwrite(const void *buf, int nb
 void pa_ap_hard_timeout(const char *s, pa_request_rec *r) {
 // Apache 2 uses non-blocking I/O
 #ifndef STANDARD20_MODULE_STUFF
-	ap_hard_timeout(s, (request_rec*)r->real_request_rec);
+	ap_hard_timeout((char *)s, (request_rec*)r->real_request_rec);
 #endif
 }
 void pa_ap_reset_timeout(pa_request_rec *r) {