misc changes

[Rakka.git] / Rakka / Resource.hs

diff --git a/Rakka/Resource.hs b/Rakka/Resource.hs
index 0333d6f53068d9daff76eadb5eb4fa56d0e105f5..c589cecceb1cea38f9ada43cc13b73b6eb7d4ebd 100644 (file)
--- a/Rakka/Resource.hs
+++ b/Rakka/Resource.hs
@@ -162,9 +162,11 @@ outputXmlPage tree formatters
                                         >>>
                                         formatter
                                         >>>
-                                        writeDocumentToString [ (a_indent, v_1) ]
+                                        writeDocumentToString [ (a_indent         , v_1 )
+                                                              , (a_output_encoding, utf8)
+                                                              , (a_no_xml_pi      , v_0 ) ]
                                       )
-         output $ UTF8.encodeString resultStr
+         output resultStr
 
 
 outputXmlPage' :: XmlTree -> IOSArrow XmlTree XmlTree -> Resource ()
@@ -179,9 +181,11 @@ outputXml tree
                                     >>>
                                     constA tree
                                     >>>
-                                    writeDocumentToString [ (a_indent, v_1) ]
+                                    writeDocumentToString [ (a_indent         , v_1 )
+                                                           , (a_output_encoding, utf8)
+                                                           , (a_no_xml_pi      , v_0 ) ]
                                   )
-        output $ UTF8.encodeString xmlStr
+        output xmlStr
 
 
 getUserID :: Environment -> Resource (Maybe String)