--- parser3/src/classes/xdoc.C	2002/09/18 08:52:50	1.101
+++ parser3/src/classes/xdoc.C	2002/09/20 13:09:49	1.103
@@ -8,7 +8,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XDOC_C="$Date: 2002/09/18 08:52:50 $";
+static const char* IDENT_XDOC_C="$Date: 2002/09/20 13:09:49 $";
 
 #include "pa_stylesheet_connection.h"
 #include "pa_request.h"
@@ -447,6 +447,10 @@ static void _create(Request& r, const St
 				&method_name, 
 				exc);
 
+		xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
+		const char *source_charset_name=pool.get_source_charset().name().cstr();
+		doc->encoding=pool.get_source_charset().transcode_buf2xchar(source_charset_name, strlen(source_charset_name));
+
 		/// +xalan createXMLDecl ?
 	}
 	
@@ -671,7 +675,8 @@ static void _file(Request& r, const Stri
 		new(pool) VString(*oo.encoding));
 	vcontent_type=vhcontent_type;
 	
-	vfile.set(false/*tainted*/, buf, buf_size, 0/*file_name*/, vcontent_type);
+	vfile.set(false/*tainted*/, buf?buf:""/*to distinguish from stat-ed file*/, buf_size, 
+		0/*file_name*/, vcontent_type);
 	r.write_no_lang(vfile);
 }