--- parser3/src/classes/file.C	2026/09/30 16:44:19	1.301
+++ parser3/src/classes/file.C	2026/10/06 23:57:02	1.306
@@ -5,8 +5,6 @@
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-#include "pa_config_includes.h"
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 #include "pa_base64.h"
@@ -27,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.301 2026/09/30 16:44:19 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.306 2026/10/06 23:57:02 moko Exp $";
 
 // defines
 
@@ -707,6 +705,7 @@ static void _list(Request& r, MethodPara
 	Value& relative_path=params.as_no_junction(0, "path must not be code");
 
 	bool stat=false;
+	bool fail_on_problem=false;
 	VRegex* vregex=0;
 	VRegexCleaner vrcleaner;
 
@@ -724,6 +723,10 @@ static void _list(Request& r, MethodPara
 					vfilter=value;
 					valid_options++;
 				}
+				if(Value* vexception=options->get(SUPPRESS_EXCEPTION_NAME)) {
+					fail_on_problem=r.process(*vexception).as_bool();
+					valid_options++;
+				}
 				if(valid_options!=options->count())
 					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else {
@@ -745,11 +748,17 @@ static void _list(Request& r, MethodPara
 		}
 	}
 
-	const char* absolute_path_cstr=r.full_disk_path(relative_path.as_string()).taint_cstr(String::L_FILE_SPEC);
-
 	Table::Action_options table_options;
 	Table& table=*new Table(file_list_table_template(), table_options);
 
+	// no exception for a uri or an invalid or tainted file://
+	const String* path=fail_on_problem ? &r.full_disk_path(relative_path.as_string()) : r.real_disk_path(relative_path.as_string());
+	if(!path) {
+		r.write(*new VTable(&table));
+		return;
+	}
+	const char* absolute_path_cstr=path->taint_cstr(String::L_FILE_SPEC);
+
 	const int ovector_size=(1/*match*/)*3;
 	int ovector[ovector_size];
 
@@ -769,6 +778,10 @@ static void _list(Request& r, MethodPara
 			}
 			table+=row;
 		}
+	,
+		if(fail_on_problem)
+			throw Exception(errno==EACCES ? "file.access" : (errno==ENOENT || errno==ENOTDIR) ? "file.missing" : 0,
+				path, "list failed: %s (%d)%s", strerror(errno), errno, actual_filename(*path, absolute_path_cstr));
 	);
 
 	// write out result
@@ -829,7 +842,7 @@ static const String* web_path(Request& r
 
 	// checking the result is inside document root;
 	// first checking the segment boundary: /root must not match /root-but-longer
-	return result.first_char()=='/' && !strncmp(disk_path->cstr(), document_root, document_root_length) ? &result : 0;
+	return result.first_char()=='/' && !path_cmp(disk_path->cstr(), document_root, document_root_length) ? &result : 0;
 }
 
 static void _find(Request& r, MethodParams& params) {
@@ -966,6 +979,10 @@ static void _fullpath(Request& r, Method
 		throw Exception(PARSER_RUNTIME, &file_spec, "is outside of $request:document-root [%s]", r.request_info.document_root);
 }
 
+static void _diskpath(Request& r, MethodParams& params) {
+	r.write(r.full_disk_path(params.as_file_spec(0)));
+}
+
 static void _sql_string(Request& r, MethodParams&) {
 	VFile& self=GET_SELF(r, VFile);
 
@@ -1293,6 +1310,8 @@ MFile::MFile(): Methoded("file") {
 	add_native_method("justext", Method::CT_STATIC, _justext, 1, 1);
 	// /some/page.html: ^file:fullpath[a.gif] => /some/a.gif
 	add_native_method("fullpath", Method::CT_STATIC, _fullpath, 1, 1);
+	// /some/page.html: ^file:diskpath[a.gif] => /document/root/some/a.gif, file:// and C:\ resolved as well
+	add_native_method("diskpath", Method::CT_STATIC, _diskpath, 1, 1);
 
 	// ^file.sql-string[]
 	add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0);