--- parser3/src/classes/xdoc.C 2011/11/11 03:55:15 1.171 +++ parser3/src/classes/xdoc.C 2012/03/16 09:24:08 1.173 @@ -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 (http://paf.design.ru) */ @@ -9,8 +9,6 @@ #ifdef XML -static const char * const IDENT_XDOC_C="$Date: 2011/11/11 03:55:15 $"; - #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.173 2012/03/16 09:24:08 moko Exp $"; + // defines #define XDOC_CLASS_NAME "xdoc" @@ -560,8 +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)?oo.filename->taint_cstr(String::L_FILE_SPEC):0, &vhcontent_type); + 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*/);