--- parser3/src/targets/apache/mod_parser3_core.C	2015/10/26 01:21:59	1.13
+++ parser3/src/targets/apache/mod_parser3_core.C	2019/12/25 22:01:03	1.18
@@ -1,11 +1,11 @@
 /** @file
 Parser: apache 1.3/2.X module, part, compiled by parser3project.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 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.13 2015/10/26 01:21:59 moko Exp $";
+volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.18 2019/12/25 22:01:03 moko Exp $";
 
 #include "pa_config_includes.h"
 
@@ -17,9 +17,8 @@ volatile const char * IDENT_MOD_PARSER3_
 #include "pa_sapi.h"
 #include "classes.h"
 #include "pa_request.h"
-#include "pa_socks.h"
 
-#if _MSC_VER && !defined(_DEBUG)
+#if defined(_MSC_VER) && !defined(_DEBUG)
 #	include <windows.h>
 #	define PA_SUPPRESS_SYSTEM_EXCEPTION
 #endif
@@ -35,10 +34,7 @@ void pa_setup_module_cells() {
 	
 	/// no trying to __try here [yet]
 	try {
-		// init socks
-		pa_socks_init();
-		
-		// init global variables
+		// init libraries
 		pa_globals_init();
 	} catch(const Exception& e) { // global problem 
 		SAPI::abort("setup_module_cells failed: %s", e.comment());
@@ -50,8 +46,6 @@ void pa_destroy_module_cells() {
 		return;
 
 	pa_globals_done();
-
-	pa_socks_done();
 }
 
 
@@ -225,7 +219,7 @@ static void real_parser_handler(SAPI_Inf
 	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::Env::get(SAPI_info, "REQUEST_URI");
+	request_info.uri=request_info.strip_absolute_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;