--- parser3/src/targets/isapi/parser3isapi.C	2026/04/25 13:38:46	1.136
+++ parser3/src/targets/isapi/parser3isapi.C	2026/10/07 19:37:27	1.140
@@ -5,7 +5,7 @@
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-volatile const char * IDENT_PARSER3ISAPI_C="$Id: parser3isapi.C,v 1.136 2026/04/25 13:38:46 moko Exp $";
+volatile const char * IDENT_PARSER3ISAPI_C="$Id: parser3isapi.C,v 1.140 2026/10/07 19:37:27 moko Exp $";
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -286,7 +286,7 @@ static void parser_done() {
 /// ISAPI //
 BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer) {
 	pVer->dwExtensionVersion = HSE_VERSION;
-	pa_strncpy(pVer->lpszExtensionDesc, "Parser " PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN);
+	pa_strncpy(pVer->lpszExtensionDesc, "Parser " PARSER_VERSION_WITH_FEATURES, HSE_MAX_EXT_DLL_NAME_LEN);
 	return parser_init();
 }
 // dwFlags & HSE_TERM_MUST_UNLOAD means we can't return false
@@ -320,17 +320,13 @@ void real_parser_handler(SAPI_Info& SAPI
 	// Request info
 	Request_info request_info;  memset(&request_info, 0, sizeof(request_info));
 
-	char *filespec_to_process=pa_strdup(lpECB->lpszPathTranslated);
-#ifdef WIN32
-	back_slashes_to_slashes(filespec_to_process);
-#endif
+	char *filespec_to_process=backslashes_to_slashes(lpECB->lpszPathTranslated);
 
 	if(const char* path_info=SAPI::Env::get(SAPI_info, "PATH_INFO")) {
 		// IIS
-		size_t len=strlen(filespec_to_process)-strlen(path_info);
-		char *buf=new(PointerFreeGC) char[len];
-		pa_strncpy(buf, filespec_to_process, len);
-		request_info.document_root=buf;
+		size_t filespec_len=strlen(filespec_to_process);
+		size_t path_info_len=strlen(path_info);
+		request_info.set_document_root(filespec_len>path_info_len ? pa_strdup(filespec_to_process, filespec_len-path_info_len) : "");
 	} else
 		throw Exception(PARSER_RUNTIME, 0, "ISAPI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)");
 
@@ -349,7 +345,7 @@ void real_parser_handler(SAPI_Info& SAPI
 	// beside by binary
 	static char beside_binary_path[MAX_STRING];
 	pa_strncpy(beside_binary_path, argv0, MAX_STRING); // filespec of my binary
-	if(!(rsplit(beside_binary_path, '/') || rsplit(beside_binary_path, '\\'))) { // strip filename
+	if(!rsplit(beside_binary_path, "/\\")) { // strip filename
 		// no path, just filename
 		beside_binary_path[0]='.'; beside_binary_path[1]=0;
 	}
@@ -380,7 +376,7 @@ static void call_real_parser_handler__su
 	} __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) {
 		if(system_exception)
 			if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord)
-				throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
+				throw Exception("system", 0, "0x%08X at %p", er->ExceptionCode, er->ExceptionAddress);
 			else
 				throw Exception("system", 0, "<no exception record>");
 		else
@@ -446,4 +442,4 @@ BOOL WINAPI DllMain(
 	);
 
 	return TRUE;
-}
\ No newline at end of file
+}