--- parser3/src/targets/apache/mod_parser3.c	2013/07/24 21:14:14	1.15
+++ parser3/src/targets/apache/mod_parser3.c	2013/10/22 16:36:55	1.17
@@ -15,7 +15,7 @@
 
 #include "pa_httpd.h"
 
-volatile const char * IDENT_MOD_PARSER3_C="$Id: mod_parser3.c,v 1.15 2013/07/24 21:14:14 moko Exp $" IDENT_PA_HTTPD_H;
+volatile const char * IDENT_MOD_PARSER3_C="$Id: mod_parser3.c,v 1.17 2013/10/22 16:36:55 moko Exp $" IDENT_PA_HTTPD_H;
 
 #define PARSER3_HANDLER "parser3-handler"
 
@@ -90,27 +90,29 @@ static int parser_handler(request_rec *r
 	// we setup module here to avoid GPF on init with php5-xsl installed
 	pa_setup_module_cells();
 
-	// converting to parser version
-	pa_request_rec pr={
-		r,
-		r->pool,
-		r->header_only,
-		&r->status,
-		r->method,
-		r->headers_out,
-		r->subprocess_env,
-		&r->content_type,
-		r->uri,
-		r->filename,
-		r->path_info,
-		r->args,
+	{
+		// converting to parser version
+		pa_request_rec pr={
+			r,
+			r->pool,
+			r->header_only,
+			&r->status,
+			r->method,
+			r->headers_out,
+			r->subprocess_env,
+			&r->content_type,
+			r->uri,
+			r->filename,
+			r->path_info,
+			r->args,
 #ifdef STANDARD20_MODULE_STUFF
-		r->finfo.filetype == 0
+			r->finfo.filetype == 0
 #else		
-		r->finfo.st_mode == 0
+			r->finfo.st_mode == 0
 #endif
-	};
-	return pa_parser_handler(&pr, our_dconfig(r));
+		};
+		return pa_parser_handler(&pr, our_dconfig(r));
+	}
 }
 
 /* 
@@ -241,7 +243,11 @@ void pa_ap_log_rerror(const char *file,
 	str=va_arg(l, const char*);
 	va_end(l); 
 
-	ap_log_rerror(file, line, level,
+	ap_log_rerror(file, line,
+#if (AP_SERVER_MAJORVERSION_NUMBER == 2) && (AP_SERVER_MINORVERSION_NUMBER >= 4)
+			APLOG_MODULE_INDEX,
+#endif
+			level,
 #ifdef STANDARD20_MODULE_STUFF
 			0,
 #endif
@@ -256,7 +262,11 @@ void pa_ap_log_error(const char *file, i
 	str=va_arg(l, const char*);
 	va_end(l); 
 
-	ap_log_error(file, line, level,
+	ap_log_error(file, line,
+#if (AP_SERVER_MAJORVERSION_NUMBER == 2) && (AP_SERVER_MINORVERSION_NUMBER >= 4)
+			APLOG_MODULE_INDEX,
+#endif
+			level,
 #ifdef STANDARD20_MODULE_STUFF
 			0,
 #endif