--- parser3/src/classes/file.C	2008/07/03 09:36:16	1.173
+++ parser3/src/classes/file.C	2008/08/21 15:58:27	1.176
@@ -5,12 +5,10 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2008/07/03 09:36:16 $";
+static const char * const IDENT_FILE_C="$Date: 2008/08/21 15:58:27 $";
 
 #include "pa_config_includes.h"
 
-#include "pcre.h"
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
@@ -619,7 +617,11 @@ static void _list(Request& r, MethodPara
 		const char* pattern=regexp->cstr();
 		const char* errptr;
 		int erroffset;
-		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
+		int options=PCRE_EXTRA | PCRE_DOTALL;
+		if(r.charsets.source().isUTF8())
+			options=options|PCRE_UTF8;
+
+		regexp_code=pcre_compile(pattern, options, 
 			&errptr, &erroffset, 
 			r.charsets.source().pcre_tables);
 
@@ -653,8 +655,8 @@ static void _list(Request& r, MethodPara
 			else if(exec_result<0) {
 				(*pcre_free)(regexp_code);
 				throw Exception(0, 
-					regexp, 
-					"regular expression execute (%d)", 
+					regexp,
+					print_pcre_exec_error_text(exec_result),
 						exec_result);
 			}
 		}