--- parser3/src/targets/apache/mod_parser3_core.C	2013/07/24 21:21:43	1.8
+++ parser3/src/targets/apache/mod_parser3_core.C	2015/10/26 01:21:59	1.13
@@ -1,11 +1,11 @@
 /** @file
 Parser: apache 1.3/2.X module, part, compiled by parser3project.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.8 2013/07/24 21:21:43 moko Exp $";
+volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.13 2015/10/26 01:21:59 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -20,6 +20,7 @@ volatile const char * IDENT_MOD_PARSER3_
 #include "pa_socks.h"
 
 #if _MSC_VER && !defined(_DEBUG)
+#	include <windows.h>
 #	define PA_SUPPRESS_SYSTEM_EXCEPTION
 #endif
 
@@ -99,7 +100,7 @@ void SAPI::abort(const char* fmt, ...) {
 	va_end(args);
 }
 
-char* SAPI::get_env(SAPI_Info& SAPI_info, const char* name) {
+char* SAPI::Env::get(SAPI_Info& SAPI_info, const char* name) {
 	const char* dont_return_me=pa_ap_table_get(SAPI_info.r->subprocess_env, name);
 	return dont_return_me?pa_strdup(dont_return_me):0;
 }
@@ -122,9 +123,9 @@ static int SAPI_environment_append(void
 	}
 	return 1/*true*/;
 }
-const char* const* SAPI::environment(SAPI_Info& SAPI_info) {
+const char* const* SAPI::Env::get(SAPI_Info& SAPI_info) {
 	const pa_table *t=SAPI_info.r->subprocess_env;
-	const char** result=new(UseGC) const char*[pa_ap_table_size(t)+1/*0*/];
+	const char** result=new const char*[pa_ap_table_size(t)+1/*0*/];
 	SAPI_environment_append_info info={result};
 	pa_ap_table_do(SAPI_environment_append, &info, t, 0); *info.cur=0; // mark EOE
 	return result;
@@ -192,8 +193,10 @@ size_t SAPI::send_body(SAPI_Info& SAPI_i
 //@}
 
 #ifndef PA_DEBUG_DISABLE_GC
+#ifndef _MSC_VER
 extern long GC_large_alloc_warn_suppressed;
 #endif
+#endif
 
 /**
 main workhorse
@@ -206,8 +209,10 @@ static void real_parser_handler(SAPI_Inf
 	GC_dont_gc=0;
 	GC_gcollect();
 	GC_dont_gc=1;
+#ifndef _MSC_VER
 	GC_large_alloc_warn_suppressed=0;
 #endif
+#endif
 
 	// populate env
 	pa_ap_add_common_vars(SAPI_info.r);
@@ -216,15 +221,15 @@ static void real_parser_handler(SAPI_Inf
 	// Request info
 	Request_info request_info;  memset(&request_info, 0, sizeof(request_info));
 	
-	request_info.document_root=SAPI::get_env(SAPI_info, "DOCUMENT_ROOT");
+	request_info.document_root=SAPI::Env::get(SAPI_info, "DOCUMENT_ROOT");
 	request_info.path_translated=SAPI_info.r->filename;
 	request_info.method=SAPI_info.r->method;
 	request_info.query_string=SAPI_info.r->args;
-	request_info.uri=SAPI::get_env(SAPI_info, "REQUEST_URI");
-	request_info.content_type=SAPI::get_env(SAPI_info, "CONTENT_TYPE");
-	const char* content_length=SAPI::get_env(SAPI_info, "CONTENT_LENGTH");
+	request_info.uri=SAPI::Env::get(SAPI_info, "REQUEST_URI");
+	request_info.content_type=SAPI::Env::get(SAPI_info, "CONTENT_TYPE");
+	const char* content_length=SAPI::Env::get(SAPI_info, "CONTENT_LENGTH");
 	request_info.content_length=content_length?atoi(content_length):0;
-	request_info.cookie=SAPI::get_env(SAPI_info, "HTTP_COOKIE");
+	request_info.cookie=SAPI::Env::get(SAPI_info, "HTTP_COOKIE");
 	request_info.mail_received=false;
 	
 	// prepare to process request