--- parser3/src/targets/apache/mod_parser3.c	2010/11/16 00:43:19	1.5
+++ parser3/src/targets/apache/mod_parser3.c	2010/11/23 00:00:32	1.8
@@ -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/16 00:43:19 $";
+static const char * const IDENT_MOD_PARSER3_C="$Date: 2010/11/23 00:00:32 $";
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -45,8 +45,6 @@ static const char * const IDENT_MOD_PARS
 #define apr_pool_t pool
 #define apr_table_t table
 
-#define ap_add_version_component(p, v) ap_add_version_component(v) 
-
 #endif /* STANDARD20_MODULE_STUFF */
 
 /*
@@ -69,18 +67,7 @@ static Parser_module_config *our_dconfig
 
 static const char* cmd_parser_config(cmd_parms *cmd, void *mconfig, char *file_spec) {
 	Parser_module_config *cfg = (Parser_module_config *) mconfig;
-	
-	// remember assigned filespec into cfg
 	cfg->parser_config_filespec=file_spec;
-	
-	return NULL;
-}
-
-static const char* cmd_parser_status_allowed(cmd_parms *cmd, void *mconfig, char *file_spec) {
-	Parser_module_config *cfg = (Parser_module_config *) mconfig;
-	
-	cfg->parser_status_allowed=1;
-	
 	return NULL;
 }
 
@@ -89,9 +76,6 @@ static const char* cmd_parser_status_all
 */
 
 static int parser_handler(request_rec *r) {
-
-//	ap_log_rerror(APLOG_MARK, APLOG_EMERG, 0, r, "handler, r->handler=%s", r->handler);
-
 #ifdef STANDARD20_MODULE_STUFF
 	if(strcmp(r->handler, PARSER3_HANDLER))
 		return DECLINED;
@@ -116,11 +100,7 @@ static int parser_handler(request_rec *r
 		r->finfo.st_mode == 0
 #endif
 	};
-
-	// config
-	Parser_module_config *dcfg=our_dconfig(r);
-
-	return pa_parser_handler(&pr, dcfg);
+	return pa_parser_handler(&pr, our_dconfig(r));
 }
 
 /* 
@@ -131,7 +111,6 @@ static int parser_handler(request_rec *r
 static void parser_module_init(apr_pool_t *p, server_rec *s) {
 #else
 static void parser_module_init(server_rec *s, apr_pool_t *p) {
-	ap_add_version_component(p, pa_version());
 #endif	
 	ap_log_perror(APLOG_MARK, APLOG_EMERG, 0, p, "parser inited %d", getpid());
 	pa_setup_module_cells();
@@ -148,63 +127,18 @@ static void parser_module_done(server_re
 * This function gets called to create a per-directory configuration record.
 */
 static void *parser_create_dir_config(apr_pool_t *p, char *dirspec) {
-	/*
-	* Allocate the space for our record from the apr_pool_t supplied.
-	*/
-	Parser_module_config *cfg= (Parser_module_config *) ap_pcalloc(p, sizeof(Parser_module_config));
-	return (void *) cfg;
-}
-
-/*
-* This function gets called to merge two per-directory configuration records.
-*
-* 20011126 paf: noticed, that this is called even on virtual root merge with something "parent",
-* while thought that that is part of merge_server...
-*
-*/
-static void *parser_merge_dir_config(apr_pool_t *p, void *parent_conf, void *newloc_conf) {
-	Parser_module_config *merged_config = (Parser_module_config *) ap_pcalloc(p, sizeof(Parser_module_config));
-	Parser_module_config *pconf = (Parser_module_config *) parent_conf;
-	Parser_module_config *nconf = (Parser_module_config *) newloc_conf;
-	
-	merged_config->parser_config_filespec = ap_pstrdup(p, nconf->parser_config_filespec?
-		nconf->parser_config_filespec:pconf->parser_config_filespec);
-	merged_config->parser_status_allowed= pconf->parser_status_allowed || nconf->parser_status_allowed;
-	
-	return (void *) merged_config;
+	Parser_module_config *cfg= ap_pcalloc(p, sizeof(Parser_module_config));
+	cfg->parser_config_filespec=NULL;
+	return cfg;
 }
 
 /*
 * This function gets called to create a per-server configuration record.
 */
 static void *parser_create_server_config(apr_pool_t *p, server_rec *s) {
-	/*
-	* As with the parser_create_dir_config() routine, we allocate and fill
-	* in an empty record.
-	*/
-	Parser_module_config *cfg= (Parser_module_config *) ap_pcalloc(p, sizeof(Parser_module_config));
-	
-	return (void *) cfg;
-}
-
-/*
-* This function gets called to merge two per-server configuration records.
-*/
-static void *parser_merge_server_config(apr_pool_t *p, void *server1_conf, void *server2_conf)
-{
-	Parser_module_config *merged_config = (Parser_module_config *) ap_pcalloc(p, sizeof(Parser_module_config));
-	Parser_module_config *s1conf = (Parser_module_config *) server1_conf;
-	Parser_module_config *s2conf = (Parser_module_config *) server2_conf;
-	
-	/*
-	* Our inheritance rules are our own, and part of our module's semantics.
-	* Basically, just note whence we came.
-	*/
-	merged_config->parser_config_filespec = ap_pstrdup(p, s2conf->parser_config_filespec?
-		s2conf->parser_config_filespec:s1conf->parser_config_filespec);
-	merged_config->parser_status_allowed= s1conf->parser_status_allowed || s2conf->parser_status_allowed;
-	
-	return (void *) merged_config;
+	Parser_module_config *cfg= ap_pcalloc(p, sizeof(Parser_module_config));
+	cfg->parser_config_filespec=NULL;
+	return cfg;
 }
 
 /* 
@@ -220,14 +154,6 @@ static const command_rec parser_cmds[] =
 			TAKE1,				/* arguments */
 			"Parser config filespec"	// directive description
 	},
-	{
-		"ParserStatusAllowed",			/* directive name */
-			(const char* (*)(void))((void *)cmd_parser_status_allowed), // config action routine
-			(void*)0,			/* argument to include in call */
-			(int)(ACCESS_CONF),		/* where available */
-			NO_ARGS,			/* arguments */
-			"Parser status class can be used" // directive description
-	},
 	{NULL}
 };
 
@@ -255,7 +181,6 @@ static const handler_rec parser_handlers
 */
 static void parser_register_hooks(apr_pool_t* pool)
 {
-//	ap_add_version_component(pool, pa_version());
 //	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);
@@ -271,9 +196,9 @@ module MODULE_VAR_EXPORT parser3_module
 	parser_module_init,		/* module initializer */
 #endif
 	parser_create_dir_config,	/* per-directory config creator */
-	parser_merge_dir_config,	/* dir config merger */
+	0,				/* dir config merger */
 	parser_create_server_config,	/* server config creator */
-	parser_merge_server_config,	/* server config merger */
+	0,				/* server config merger */
 	parser_cmds,			/* command apr_table_t */
 #ifdef STANDARD20_MODULE_STUFF
 	parser_register_hooks		/* register hooks */
@@ -304,21 +229,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;
@@ -394,7 +304,7 @@ int pa_ap_rwrite(const void *buf, int nb
 
 // http_main.h
 
-void pa_ap_hard_timeout(char *s, pa_request_rec *r) {
+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);