--- parser3/src/targets/cgi/parser3.C	2013/07/23 13:07:49	1.264
+++ parser3/src/targets/cgi/parser3.C	2016/11/25 23:35:45	1.271
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	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_PARSER3_C="$Id: parser3.C,v 1.264 2013/07/23 13:07:49 moko Exp $";
+volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.271 2016/11/25 23:35:45 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -15,6 +15,7 @@ volatile const char * IDENT_PARSER3_C="$
 #include "pa_request.h"
 #include "pa_socks.h"
 #include "pa_version.h"
+#include "pa_vconsole.h"
 
 #ifdef _MSC_VER
 #include <crtdbg.h>
@@ -209,14 +210,14 @@ void SAPI::abort(const char* fmt, ...) {
 //	va_end(args);
 }
 
-char* SAPI::get_env(SAPI_Info& , const char* name) {
+char* SAPI::Env::get(SAPI_Info& , const char* name) {
 	if(char *local=getenv(name))
 		return pa_strdup(local);
 	else
 		return 0;
 }
 
-const char* const *SAPI::environment(SAPI_Info&) {
+const char* const *SAPI::Env::get(SAPI_Info&) {
 #ifdef _MSC_VER
 	extern char **_environ;
 	return _environ;
@@ -429,7 +430,7 @@ static void real_parser_handler(const ch
 		if(!script_name)
 				SAPI::die("CGI: illegal call (missing SCRIPT_NAME)");
 
-		const char* env_request_uri=getenv("REQUEST_URI");
+		const char* env_request_uri=request_info.strip_absolute_uri(getenv("REQUEST_URI"));
 		if(env_request_uri)
 			request_info.uri=env_request_uri;
 		else 
@@ -612,7 +613,7 @@ static void call_real_parser_handler__su
 static void usage(const char* program) {
 	printf(
 		"Parser/%s\n"
-		"Copyright (c) 2001-2013 Art. Lebedev Studio (http://www.artlebedev.com)\n"
+		"Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"
@@ -631,10 +632,9 @@ int main(int argc, char *argv[]) {
 #ifdef PA_DEBUG_CGI_ENTRY_EXIT
 	log("main: entry");
 #endif
-	//_asm int 3;
-	GC_java_finalization=0;
 
 #ifndef PA_DEBUG_DISABLE_GC
+	GC_java_finalization=0;
 	// Dont collect unless explicitly requested 
 	// this is quicker (~30% ), but less memory-efficient(~8%)
 	// so deciding for speed