--- parser3/src/classes/xdoc.C	2011/11/23 12:17:23	1.172
+++ parser3/src/classes/xdoc.C	2012/06/15 11:54:18	1.176
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,8 +9,6 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2011/11/23 12:17:23 $";
-
 #include "libxml/tree.h"
 #include "libxml/HTMLtree.h"
 #include "libxslt/xsltInternals.h"
@@ -30,6 +28,8 @@ static const char * const IDENT_XDOC_C="
 #include "xnode.h"
 #include "pa_charsets.h"
 
+volatile const char * IDENT_XDOC_C="$Id: xdoc.C,v 1.176 2012/06/15 11:54:18 moko Exp $";
+
 // defines
 
 #define XDOC_CLASS_NAME "xdoc"
@@ -560,9 +560,7 @@ static void _file(Request& r, MethodPara
 		String::Body("charset"), 
 		new VString(*oo.encoding));
 
-	vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, oo.filename, &vhcontent_type);
-
-	vfile.set_mode(true/*text*/);
+	vfile.set_binary(false/*not tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, oo.filename, &vhcontent_type);
 
 	// write out result
 	r.write_no_lang(vfile);
@@ -640,7 +638,7 @@ static void _transform(Request& r, Metho
 	Array<const xmlChar*> transform_strings;
 	const xmlChar** transform_params=0;
 	if(params.count()>1)
-		if(HashStringValue* hash=params.as_hash(1)) {
+		if(HashStringValue* hash=params.as_hash(1, "transform options")) {
 			transform_params=new(UseGC) const xmlChar*[hash->count()*2+1];
 			Add_xslt_param_info info={
 				&r,