xmlparser 0.6.81 → 0.7.2.1

data/ext/extconf.rb

@@ -0,0 +1,58 @@
+#
+# ruby extconf.rb
+#         --with-perl-enc-map[=/path/to/enc-map]
+#         --with-expat-dir=/path/to/expat
+#         --with-expat-lib=/path/to/expat/lib
+#         --with-expat-include=/path/to/expat/include
+#
+require 'mkmf'
+
+cwd=`pwd`.chomp!
+perl= ENV['PERL'] || 'perl'
+
+## Encoding maps may be stored in $perl_archlib/XML/Parser/Encodins/
+#perl_archlib = '/usr/lib/perl5/site_perl/5.005/i586-linux'
+#perl_archlib = '/usr/local/lib'
+perl_archlib = `#{perl} -e 'use Config; print $Config{"archlib"}'`
+xml_enc_path = with_config("perl-enc-map")
+if xml_enc_path == true
+  xml_enc_path = perl_archlib + "/XML/Parser/Encodings"
+end
+
+##$CFLAGS="-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok" +
+##  ' -DXML_ENC_PATH=getenv\(\"XML_ENC_PATH\"\)' +
+##  " -DNEW_EXPAT"
+#$CFLAGS = "-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok"
+#$LDFLAGS = "-L#{cwd}/expat/xmlparse -Wl,-rpath,/usr/local/lib"
+#$LDFLAGS = "-L#{cwd}/expat/xmlparse"
+dir_config("expat")
+#dir_config("xmltok")
+#dir_config("xmlparse")
+if xml_enc_path
+  $CFLAGS += " -DXML_ENC_PATH=\\\"#{xml_enc_path}\\\""
+end
+
+#if have_header("xmlparse.h") || have_header("expat.h")
+if have_header("expat.h") || have_header("xmlparse.h")
+  if have_library("expat", "XML_ParserCreate") ||
+      have_library("xmltok", "XML_ParserCreate")
+    if have_func("XML_SetNotStandaloneHandler")
+      $CFLAGS += " -DNEW_EXPAT"
+    end
+    if have_func("XML_SetParamEntityParsing")
+      $CFLAGS += " -DXML_DTD"
+    end
+#    if have_func("XML_SetExternalParsedEntityDeclHandler")
+#      $CFLAGS += " -DEXPAT_1_2"
+#    end
+    have_func("XML_SetDoctypeDeclHandler")
+    have_func("XML_ParserReset")
+    have_func("XML_SetSkippedEntityHandler")
+    have_func("XML_GetFeatureList")
+    have_func("XML_UseForeignDTD")
+    have_func("XML_GetIdAttributeIndex")
+    have_library("socket", "ntohl")
+    have_library("wsock32") if RUBY_PLATFORM =~ /mswin32|mingw/
+    create_makefile("xmlparser")
+  end
+end

data/ext/{xmlparser/xmlparser.c → xmlparser.c}

@@ -1,5 +1,6 @@
 /*
  *  Expat (XML Parser Toolkit) wrapper for Ruby
+ *  Dec 15, 2009 yoshidam version 0.7.0  support Ruby 1.9.1
  *  Feb 16, 2004 yoshidam version 0.6.8  taint output string
  *  Feb 16, 2004 yoshidam version 0.6.7  fix buffer overflow
  *  Mar 11, 2003 yoshidam version 0.6.6  fix skippedEntity handler
@@ -41,7 +42,11 @@
  */
 
 #include "ruby.h"
-#include "rubyio.h"
+#ifdef HAVE_RUBY_IO_H
+#  include "ruby/io.h"
+#else
+#  include "rubyio.h"
+#endif
 #include <stdio.h>
 #include <ctype.h>
 #ifdef HAVE_EXPAT_H
@@ -58,6 +63,15 @@
 #  endif
 #endif
 
+#ifndef RSTRING_PTR
+#  define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#  define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifdef HAVE_RUBY_ENCODING_H
+static rb_encoding* enc_xml;
+#endif
+
 static VALUE eXMLParserError;
 static VALUE cXMLParser;
 static VALUE cXMLEncoding;
@@ -112,6 +126,7 @@ typedef struct _XMLParser {
   int tainted;
   VALUE parent;
   char* context;
+  const XML_Char *detectedEncoding;
 } XMLParser;
 
 static VALUE symDEFAULT;
@@ -198,6 +213,12 @@ freezeObject(VALUE obj) {
 }
 #define FO_(o) (freezeObject(o))
 
+#ifdef HAVE_RUBY_ENCODING_H
+#  define ENC_(o) (rb_enc_associate(o, enc_xml))
+#else
+#  define ENC_(o) (o)
+#endif
+
 
 /* Event handlers for iterator */
 static void
@@ -216,12 +237,12 @@ iterStartElementHandler(void *recv,
     const char* key = *atts++;
     const char* val = *atts++;
     rb_hash_aset(attrhash,
-		 FO_(TO_(rb_str_new2((char*)key))),
-		 TO_(rb_str_new2((char*)val)));
+		 FO_(TO_(ENC_(rb_str_new2((char*)key)))),
+		 TO_(ENC_(rb_str_new2((char*)val))));
   }
   
   rb_yield(rb_ary_new3(4, symSTART_ELEM,
-		       TO_(rb_str_new2((char*)name)), attrhash, recv));
+		       TO_(ENC_(rb_str_new2((char*)name))), attrhash, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -235,7 +256,7 @@ iterEndElementHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symEND_ELEM,
-		       TO_(rb_str_new2((char*)name)), Qnil, recv));
+		       TO_(ENC_(rb_str_new2((char*)name))), Qnil, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -250,7 +271,7 @@ iterCharacterDataHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symCDATA,
-		       Qnil, TO_(rb_str_new((char*)s, len)), recv));
+		       Qnil, TO_(ENC_(rb_str_new((char*)s, len))), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -265,8 +286,8 @@ iterProcessingInstructionHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symPI,
-		       TO_(rb_str_new2((char*)target)),
-		       TO_(rb_str_new2((char*)data)), recv));
+		       TO_(ENC_(rb_str_new2((char*)target))),
+		       TO_(ENC_(rb_str_new2((char*)data))), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -281,7 +302,7 @@ iterDefaultHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symDEFAULT,
-		       Qnil, TO_(rb_str_new((char*)s, len)), recv));
+		       Qnil, TO_(ENC_(rb_str_new((char*)s, len))), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     /* XML_DefaultCurrent shoould not call in defaultHandler */
@@ -301,12 +322,12 @@ iterUnparsedEntityDeclHandler(void *recv,
   VALUE valary;
 
   GET_PARSER(recv, parser);
-  valary = rb_ary_new3(4, (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		       TO_(rb_str_new2((char*)systemId)),
-		       (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil),
-		       TO_(rb_str_new2((char*)notationName)));
+  valary = rb_ary_new3(4, (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		       TO_(ENC_(rb_str_new2((char*)systemId))),
+		       (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil),
+		       TO_(ENC_(rb_str_new2((char*)notationName))));
   rb_yield(rb_ary_new3(4, symUNPARSED_ENTITY_DECL,
-		       TO_(rb_str_new2((char*)entityName)),
+		       TO_(ENC_(rb_str_new2((char*)entityName))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -326,11 +347,11 @@ iterNotationDeclHandler(void *recv,
 
   GET_PARSER(recv, parser);
   valary = rb_ary_new3(3,
-		       (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		       (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-		       (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+		       (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		       (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+		       (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
   rb_yield(rb_ary_new3(4, symNOTATION_DECL,
-		       TO_(rb_str_new2((char*)notationName)),
+		       TO_(ENC_(rb_str_new2((char*)notationName))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -353,11 +374,11 @@ iterExternalEntityRefHandler(XML_Parser xmlparser,
   recv = (VALUE)XML_GetUserData(xmlparser);
   GET_PARSER(recv, parser);
   valary = rb_ary_new3(3,
-		       (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		       (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-		       (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+		       (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		       (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+		       (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
   ret = rb_yield(rb_ary_new3(4, symEXTERNAL_ENTITY_REF,
-			     (context ? TO_(rb_str_new2((char*)context)) : Qnil),
+			     (context ? TO_(ENC_(rb_str_new2((char*)context))) : Qnil),
 			     valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -376,7 +397,7 @@ iterCommentHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symCOMMENT,
-		       Qnil, TO_(rb_str_new2((char*)s)), recv));
+		       Qnil, TO_(ENC_(rb_str_new2((char*)s))), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -415,8 +436,8 @@ iterStartNamespaceDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symSTART_NAMESPACE_DECL,
-		       (prefix ? TO_(rb_str_new2((char*)prefix)) : Qnil),
-		       (uri ? TO_(rb_str_new2((char*)uri)) : Qnil), recv));
+		       (prefix ? TO_(ENC_(rb_str_new2((char*)prefix))) : Qnil),
+		       (uri ? TO_(ENC_(rb_str_new2((char*)uri))) : Qnil), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -430,7 +451,7 @@ iterEndNamespaceDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symEND_NAMESPACE_DECL,
-		       (prefix ? TO_(rb_str_new2((char*)prefix)) : Qnil),
+		       (prefix ? TO_(ENC_(rb_str_new2((char*)prefix))) : Qnil),
 		       Qnil, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -458,12 +479,12 @@ iterStartDoctypeDeclHandler(void *recv,
   GET_PARSER(recv, parser);
 #ifdef HAVE_EXPAT_H
   valary = rb_ary_new3(3,
-		       (sysid ? TO_(rb_str_new2((char*)sysid)) : Qnil),
-		       (pubid ? TO_(rb_str_new2((char*)pubid)) : Qnil),
+		       (sysid ? TO_(ENC_(rb_str_new2((char*)sysid))) : Qnil),
+		       (pubid ? TO_(ENC_(rb_str_new2((char*)pubid))) : Qnil),
 		       (has_internal_subset ? Qtrue : Qfalse));
 #endif
   rb_yield(rb_ary_new3(4, symSTART_DOCTYPE_DECL,
-		       TO_(rb_str_new2((char*)doctypeName)),
+		       TO_(ENC_(rb_str_new2((char*)doctypeName))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -498,18 +519,18 @@ makeContentArray(XMLParser* parser, XML_Content* model)
   static const char* content_quant_name[] = {
     "", "?", "*", "+"
   };
-  int i;
+  unsigned int i;
   VALUE children = Qnil;
   const char* type_name = content_type_name[model->type];
   const char* quant_name = content_quant_name[model->quant];
   VALUE ret = rb_ary_new3(3,
-			  TO_(rb_str_new2((char*)type_name)),
-			  TO_(rb_str_new2((char*)quant_name)),
-			  (model->name ? TO_(rb_str_new2((char*)model->name)) :
+			  TO_(ENC_(rb_str_new2((char*)type_name))),
+			  TO_(ENC_(rb_str_new2((char*)quant_name))),
+			  (model->name ? TO_(ENC_(rb_str_new2((char*)model->name))) :
 			   Qnil));
   if (model->numchildren > 0) {
     children = rb_ary_new();
-    for (i =0; i < model->numchildren; i++) {
+    for (i = 0; i < model->numchildren; i++) {
       VALUE child = makeContentArray(parser, model->children + i);
       rb_ary_push(children, child);
     }
@@ -526,10 +547,11 @@ iterElementDeclHandler(void *recv,
 		       XML_Content *model)
 {
   XMLParser* parser;
+  VALUE content;
   GET_PARSER(recv, parser);
-  VALUE content = makeContentArray(parser, model);
+  content = makeContentArray(parser, model);
   rb_yield(rb_ary_new3(4, symELEMENT_DECL,
-		       TO_(rb_str_new2(name)),
+		       TO_(ENC_(rb_str_new2(name))),
 		       content, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -550,12 +572,12 @@ iterAttlistDeclHandler (void *recv,
 
   GET_PARSER(recv, parser);
   valary = rb_ary_new3(4,
-		       TO_(rb_str_new2((char*)attname)),
-		       TO_(rb_str_new2((char*)att_type)),
-		       (dflt ? TO_(rb_str_new2((char*)dflt)) : Qnil),
+		       TO_(ENC_(rb_str_new2((char*)attname))),
+		       TO_(ENC_(rb_str_new2((char*)att_type))),
+		       (dflt ? TO_(ENC_(rb_str_new2((char*)dflt))) : Qnil),
 		       (isrequired ? Qtrue : Qfalse));
   rb_yield(rb_ary_new3(4, symATTLIST_DECL,
-		       TO_(rb_str_new2(elname)),
+		       TO_(ENC_(rb_str_new2(elname))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -574,8 +596,8 @@ iterXmlDeclHandler (void *recv,
 
   GET_PARSER(recv, parser);
   valary = rb_ary_new3(3,
-		       (version ? TO_(rb_str_new2(version)) : Qnil),
-		       (encoding ? TO_(rb_str_new2((char*)encoding)) : Qnil),
+		       (version ? TO_(ENC_(rb_str_new2(version))) : Qnil),
+		       (encoding ? TO_(ENC_(rb_str_new2((char*)encoding))) : Qnil),
 		       INT2FIX(standalone));
   rb_yield(rb_ary_new3(4, symXML_DECL,
 		       Qnil,
@@ -603,14 +625,14 @@ iterEntityDeclHandler (void *recv,
   GET_PARSER(recv, parser);
   valary = rb_ary_new3(6,
 		       (is_parameter_entity ? Qtrue : Qfalse),
-		       TO_(rb_str_new((char*)value, value_length)),
-		       (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		       (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-		       (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil),
-		       (notationName ? TO_(rb_str_new2((char*)notationName))
+		       TO_(ENC_(rb_str_new((char*)value, value_length))),
+		       (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		       (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+		       (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil),
+		       (notationName ? TO_(ENC_(rb_str_new2((char*)notationName)))
 			: Qnil));
   rb_yield(rb_ary_new3(4, symENTITY_DECL,
-		       TO_(rb_str_new2(entityName)),
+		       TO_(ENC_(rb_str_new2(entityName))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -632,11 +654,11 @@ iterExternalParsedEntityDeclHandler(void *recv,
   VALUE valary;
 
   GET_PARSER(recv, parser);
-  valary = rb_ary_new3(3, (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		       TO_(rb_str_new2((char*)systemId)),
-		       (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+  valary = rb_ary_new3(3, (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		       TO_(ENC_(rb_str_new2((char*)systemId))),
+		       (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
   rb_yield(rb_ary_new3(4, symEXTERNAL_PARSED_ENTITY_DECL,
-		       TO_(rb_str_new2((char*)entityName)),
+		       TO_(ENC_(rb_str_new2((char*)entityName))),
 		       valary, recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -653,9 +675,9 @@ iterInternalParsedEntityDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symINTERNAL_PARSED_ENTITY_DECL,
-		       TO_(rb_str_new2((char*)entityName)),
-		       TO_(rb_str_new((char*)replacementText,
-				      replacementTextLength)), recv));
+		       TO_(ENC_(rb_str_new2((char*)entityName))),
+		       TO_(ENC_(rb_str_new((char*)replacementText,
+                                           replacementTextLength))), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
     XML_DefaultCurrent(parser->parser);
@@ -672,7 +694,7 @@ iterSkippedEntityHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_yield(rb_ary_new3(4, symSKIPPED_ENTITY,
-		       TO_(rb_str_new2((char*)entityName)),
+		       TO_(ENC_(rb_str_new2((char*)entityName))),
 		       INT2FIX(is_parameter_entity), recv));
   if (parser->defaultCurrent) {
     parser->defaultCurrent = 0;
@@ -700,11 +722,11 @@ myStartElementHandler(void *recv,
     const char* key = *atts++;
     const char* val = *atts++;
     rb_hash_aset(attrhash,
-		 FO_(TO_(rb_str_new2((char*)key))),
-		 TO_(rb_str_new2((char*)val)));
+		 FO_(TO_(ENC_(rb_str_new2((char*)key)))),
+		 TO_(ENC_(rb_str_new2((char*)val))));
   }
   rb_funcall((VALUE)recv, id_startElementHandler, 2,
-	     TO_(rb_str_new2((char*)name)), attrhash);
+	     TO_(ENC_(rb_str_new2((char*)name))), attrhash);
 }
 
 static void
@@ -714,7 +736,7 @@ myEndElementHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_endElementHandler, 1,
-	     TO_(rb_str_new2((char*)name)));
+	     TO_(ENC_(rb_str_new2((char*)name))));
 }
 
 static void
@@ -725,7 +747,7 @@ myCharacterDataHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_characterDataHandler, 1,
-	     TO_(rb_str_new((char*)s, len)));
+	     TO_(ENC_(rb_str_new((char*)s, len))));
 }
 
 static void
@@ -736,8 +758,8 @@ myProcessingInstructionHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_processingInstructionHandler, 2,
-	     TO_(rb_str_new2((char*)target)),
-	     TO_(rb_str_new2((char*)data)));
+	     TO_(ENC_(rb_str_new2((char*)target))),
+	     TO_(ENC_(rb_str_new2((char*)data))));
 }
 
 static void
@@ -748,7 +770,7 @@ myDefaultHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_defaultHandler, 1,
-	     TO_(rb_str_new((char*)s, len)));
+	     TO_(ENC_(rb_str_new((char*)s, len))));
 }
 
 #ifdef NEW_EXPAT
@@ -760,7 +782,7 @@ myDefaultExpandHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_defaultExpandHandler, 1,
-	     TO_(rb_str_new((char*)s, len)));
+	     TO_(ENC_(rb_str_new((char*)s, len))));
 }
 #endif
 
@@ -775,11 +797,11 @@ myUnparsedEntityDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_unparsedEntityDeclHandler, 5,
-	     TO_(rb_str_new2((char*)entityName)),
-	     (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-	     TO_(rb_str_new2((char*)systemId)),
-	     (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil),
-	     TO_(rb_str_new2((char*)notationName)));
+	     TO_(ENC_(rb_str_new2((char*)entityName))),
+	     (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+	     TO_(ENC_(rb_str_new2((char*)systemId))),
+	     (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil),
+	     TO_(ENC_(rb_str_new2((char*)notationName))));
 }
 
 void
@@ -792,10 +814,10 @@ myNotationDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_notationDeclHandler, 4,
-	     TO_(rb_str_new2((char*)notationName)),
-	     (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-	     (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-	     (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+	     TO_(ENC_(rb_str_new2((char*)notationName))),
+	     (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+	     (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+	     (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
 }
 
 int
@@ -812,10 +834,10 @@ myExternalEntityRefHandler(XML_Parser xmlparser,
   recv = (VALUE)XML_GetUserData(xmlparser);
   GET_PARSER(recv, parser);
   ret = rb_funcall(recv, id_externalEntityRefHandler, 4,
-		   (context ? TO_(rb_str_new2((char*)context)): Qnil),
-		   (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-		   (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-		   (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+		   (context ? TO_(ENC_(rb_str_new2((char*)context))): Qnil),
+		   (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+		   (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+		   (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
   /* The error status in this handler should be returned
      by the exception. */
   return Qnil;
@@ -829,7 +851,7 @@ myCommentHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_commentHandler, 1,
-	     TO_(rb_str_new2((char*)s)));
+	     TO_(ENC_(rb_str_new2((char*)s))));
 }
 
 static void
@@ -856,8 +878,8 @@ myStartNamespaceDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_startNamespaceDeclHandler, 2,
-	     (prefix ? TO_(rb_str_new2((char*)prefix)) : Qnil),
-	     (uri ? TO_(rb_str_new2((char*)uri)) : Qnil));
+	     (prefix ? TO_(ENC_(rb_str_new2((char*)prefix))) : Qnil),
+	     (uri ? TO_(ENC_(rb_str_new2((char*)uri))) : Qnil));
 }
 
 static void
@@ -867,7 +889,7 @@ myEndNamespaceDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_endNamespaceDeclHandler, 1,
-	     (prefix ? TO_(rb_str_new2((char*)prefix)) : Qnil));
+	     (prefix ? TO_(ENC_(rb_str_new2((char*)prefix))) : Qnil));
 }
 
 static int
@@ -900,13 +922,13 @@ myStartDoctypeDeclHandler(void *recv,
   GET_PARSER(recv, parser);
 #ifdef HAVE_EXPAT_H
   rb_funcall((VALUE)recv, id_startDoctypeDeclHandler, 4,
-	     TO_(rb_str_new2((char*)doctypeName)),
-	     (sysid ? TO_(rb_str_new2((char*)sysid)) : Qnil),
-	     (pubid ? TO_(rb_str_new2((char*)pubid)) : Qnil),
+	     TO_(ENC_(rb_str_new2((char*)doctypeName))),
+	     (sysid ? TO_(ENC_(rb_str_new2((char*)sysid))) : Qnil),
+	     (pubid ? TO_(ENC_(rb_str_new2((char*)pubid))) : Qnil),
 	     (has_internal_subset ? Qtrue : Qfalse));
 #else
   rb_funcall((VALUE)recv, id_startDoctypeDeclHandler, 4,
-	     TO_(rb_str_new2((char*)doctypeName)),
+	     TO_(ENC_(rb_str_new2((char*)doctypeName))),
 	     Qnil, Qnil, Qfalse);
 #endif
 }
@@ -929,10 +951,11 @@ myElementDeclHandler(void *recv,
 		     XML_Content *model)
 {
   XMLParser* parser;
+  VALUE content;
   GET_PARSER(recv, parser);
-  VALUE content = makeContentArray(parser, model);
+  content = makeContentArray(parser, model);
   rb_funcall((VALUE)recv, id_elementDeclHandler, 2,
-	     TO_(rb_str_new2(name)), content);
+	     TO_(ENC_(rb_str_new2(name))), content);
 }
 
 static void
@@ -946,10 +969,10 @@ myAttlistDeclHandler (void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_attlistDeclHandler, 5,
-	     TO_(rb_str_new2(elname)),
-	     TO_(rb_str_new2((char*)attname)),
-	     TO_(rb_str_new2((char*)att_type)),
-	     (dflt ? TO_(rb_str_new2((char*)dflt)) : Qnil),
+	     TO_(ENC_(rb_str_new2(elname))),
+	     TO_(ENC_(rb_str_new2((char*)attname))),
+	     TO_(ENC_(rb_str_new2((char*)att_type))),
+	     (dflt ? TO_(ENC_(rb_str_new2((char*)dflt))) : Qnil),
 	     (isrequired ? Qtrue : Qfalse));
 }
 
@@ -962,8 +985,8 @@ myXmlDeclHandler (void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_xmlDeclHandler, 3,
-	     (version ? TO_(rb_str_new2(version)) : Qnil),
-	     (encoding ? TO_(rb_str_new2((char*)encoding)) : Qnil),
+	     (version ? TO_(ENC_(rb_str_new2(version))) : Qnil),
+	     (encoding ? TO_(ENC_(rb_str_new2((char*)encoding))) : Qnil),
 	     INT2FIX(standalone));
 }
 
@@ -981,13 +1004,13 @@ myEntityDeclHandler (void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_entityDeclHandler, 7,
-	     TO_(rb_str_new2(entityName)),
+	     TO_(ENC_(rb_str_new2(entityName))),
 	     (is_parameter_entity ? Qtrue : Qfalse),
-	     TO_(rb_str_new((char*)value, value_length)),
-	     (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-	     (systemId ? TO_(rb_str_new2((char*)systemId)) : Qnil),
-	     (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil),
-	     (notationName ? TO_(rb_str_new2((char*)notationName))
+	     TO_(ENC_(rb_str_new((char*)value, value_length))),
+	     (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+	     (systemId ? TO_(ENC_(rb_str_new2((char*)systemId))) : Qnil),
+	     (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil),
+	     (notationName ? TO_(ENC_(rb_str_new2((char*)notationName)))
 	      : Qnil));
 }
 
@@ -1004,10 +1027,10 @@ myExternalParsedEntityDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_externalParsedEntityDeclHandler, 4,
-	     TO_(rb_str_new2((char*)entityName)),
-	     (base ? TO_(rb_str_new2((char*)base)) : Qnil),
-	     TO_(rb_str_new2((char*)systemId)),
-	     (publicId ? TO_(rb_str_new2((char*)publicId)) : Qnil));
+	     TO_(ENC_(rb_str_new2((char*)entityName))),
+	     (base ? TO_(ENC_(rb_str_new2((char*)base))) : Qnil),
+	     TO_(ENC_(rb_str_new2((char*)systemId))),
+	     (publicId ? TO_(ENC_(rb_str_new2((char*)publicId))) : Qnil));
 }
 
 static void
@@ -1019,9 +1042,9 @@ myInternalParsedEntityDeclHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_internalParsedEntityDeclHandler, 2,
-	     TO_(rb_str_new2((char*)entityName)),
-	     TO_(rb_str_new((char*)replacementText,
-			    replacementTextLength)));
+	     TO_(ENC_(rb_str_new2((char*)entityName))),
+	     TO_(ENC_(rb_str_new((char*)replacementText,
+                                 replacementTextLength))));
 }
 #endif
 
@@ -1043,21 +1066,21 @@ myEncodingConv(void *data, const char *s)
 {
   VALUE v;
   int len;
-  int slen = RSTRING(rb_ivar_get((VALUE)data,
-				 id_map))->ptr[*(unsigned char*)s];
+  int slen = RSTRING_PTR(rb_ivar_get((VALUE)data,
+                                     id_map))[*(unsigned char*)s];
 
-  v = rb_funcall((VALUE)data, id_convert, 1, rb_str_new((char*)s, -slen));
+  v = rb_funcall((VALUE)data, id_convert, 1, ENC_(rb_str_new((char*)s, -slen)));
   switch (TYPE(v)) {
   case T_FIXNUM:
     return FIX2INT(v);
   case T_STRING:
-    len = RSTRING(v)->len;
+    len = RSTRING_LEN(v);
     if (len == 1) {
-      return (unsigned char)*(RSTRING(v)->ptr);
+      return (unsigned char)*RSTRING_PTR(v);
     }
     else if (len >= 2) {
-      return (unsigned char)*(RSTRING(v)->ptr) |
-	(unsigned char)*(RSTRING(v)->ptr + 1) << 8;
+      return (unsigned char)*RSTRING_PTR(v) |
+	(unsigned char)*(RSTRING_PTR(v) + 1) << 8;
     }
   }
   return 0;
@@ -1077,7 +1100,7 @@ iterUnknownEncodingHandler(void *recv,
 
   GET_PARSER(recv, parser);
   ret = rb_yield(rb_ary_new3(4, symUNKNOWN_ENCODING,
-			     TO_(rb_str_new2((char*)name)), Qnil, recv));
+			     TO_(ENC_(rb_str_new2((char*)name))), Qnil, recv));
   if (TYPE(ret) == T_OBJECT && rb_obj_is_kind_of(ret, cXMLEncoding)) {
     int i;
     ID mid = rb_intern("map");
@@ -1086,7 +1109,7 @@ iterUnknownEncodingHandler(void *recv,
 
     for (i = 0; i < 256; i++) {
       VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
-      RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
+      RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
     }
     /* protect object form GC */
     rb_ivar_set(recv, rb_intern("_encoding"), ret);
@@ -1241,8 +1264,6 @@ findEncoding(const char* encname)
     file[len] = tolower(*p);
   }
   file[len] = '\0';
-  //  if (len < PATH_MAX - sizeof(encext))
-  //    strcat(file, encext);
   strncat(file, encext, PATH_MAX - len -1);
 
   if ((fp = fopen(file, "rb")) == NULL) {
@@ -1274,6 +1295,10 @@ myUnknownEncodingHandler(void *recv,
 {
   XMLParser* parser;
   VALUE ret;
+
+  GET_PARSER(recv, parser);
+  parser->detectedEncoding = name;
+
   if (!rb_method_boundp(CLASS_OF((VALUE)recv), id_unknownEncoding, 0))
 #ifndef XML_ENC_PATH
     return 0;
@@ -1293,9 +1318,8 @@ myUnknownEncodingHandler(void *recv,
   }
 #endif
 
-  GET_PARSER(recv, parser);
   ret = rb_funcall((VALUE)recv, id_unknownEncoding, 1,
-		   TO_(rb_str_new2((char*)name)));
+		   TO_(ENC_(rb_str_new2((char*)name))));
   if (TYPE(ret) == T_OBJECT && rb_obj_is_kind_of(ret, cXMLEncoding)) {
     int i;
     ID mid = rb_intern("map");
@@ -1308,7 +1332,7 @@ myUnknownEncodingHandler(void *recv,
 
     for (i = 0; i < 256; i++) {
       VALUE m = rb_funcall(ret, mid, 1, INT2FIX(i));
-      RSTRING(cmap)->ptr[i] = info->map[i] = FIX2INT(m);
+      RSTRING_PTR(cmap)[i] = info->map[i] = FIX2INT(m);
     }
     /* protect object form GC */
     rb_ivar_set((VALUE)recv, rb_intern("_encoding"), ret);
@@ -1330,7 +1354,7 @@ mySkippedEntityHandler(void *recv,
   XMLParser* parser;
   GET_PARSER(recv, parser);
   rb_funcall((VALUE)recv, id_skippedEntityHandler, 2,
-	     TO_(rb_str_new2((char*)entityName)),
+	     TO_(ENC_(rb_str_new2((char*)entityName))),
 	     INT2FIX(is_parameter_entity));
 }
 #endif
@@ -1359,7 +1383,7 @@ XMLParser_new(int argc, VALUE* argv, VALUE klass)
     /* new(encoding) */
     if (TYPE(arg1) != T_NIL) {
       Check_Type(arg1, T_STRING); /* encoding */
-      encoding = RSTRING(arg1)->ptr;
+      encoding = RSTRING_PTR(arg1);
     }
   }
   else if (count == 2) {
@@ -1369,10 +1393,10 @@ XMLParser_new(int argc, VALUE* argv, VALUE klass)
     if (TYPE(arg1) != T_DATA) {
       if (TYPE(arg1) != T_NIL) {
 	Check_Type(arg1, T_STRING); /* encoding */
-	encoding = RSTRING(arg1)->ptr;
+	encoding = RSTRING_PTR(arg1);
       }
       Check_Type(arg2, T_STRING); /* nschar */
-      nssep = RSTRING(arg2)->ptr;
+      nssep = RSTRING_PTR(arg2);
     }
     else {
 #endif
@@ -1380,7 +1404,7 @@ XMLParser_new(int argc, VALUE* argv, VALUE klass)
       GET_PARSER(arg1, rootparser);
       if (!NIL_P(arg2)) {
 	Check_Type(arg2, T_STRING); /* context */
-	context = RSTRING(arg2)->ptr;
+	context = RSTRING_PTR(arg2);
       }
       parent = arg1;
 #ifdef NEW_EXPAT
@@ -1393,10 +1417,10 @@ XMLParser_new(int argc, VALUE* argv, VALUE klass)
     GET_PARSER(arg1, rootparser);
     if (!NIL_P(arg2)) {
       Check_Type(arg2, T_STRING); /* context */
-      context = RSTRING(arg2)->ptr;
+      context = RSTRING_PTR(arg2);
     }
     Check_Type(arg3, T_STRING); /* encoding */
-    encoding = RSTRING(arg3)->ptr;
+    encoding = RSTRING_PTR(arg3);
     parent = arg1;
   }
 
@@ -1465,6 +1489,7 @@ XMLParser_new(int argc, VALUE* argv, VALUE klass)
   parser->lastAttrs = NULL;
 #endif
   parser->parent = parent;
+  parser->detectedEncoding = NULL;
 
   rb_obj_call_init(obj, argc, argv);
 
@@ -1491,7 +1516,7 @@ XMLParser_reset(int argc, VALUE* argv, VALUE obj)
   GET_PARSER(obj, parser);
   if (count > 0 && TYPE(vencoding) != T_NIL) {
     Check_Type(vencoding, T_STRING);
-    encoding = RSTRING(vencoding)->ptr;
+    encoding = RSTRING_PTR(vencoding);
   }
   XML_ParserReset(parser->parser, encoding);
   /* setting up internal data */
@@ -1502,17 +1527,14 @@ XMLParser_reset(int argc, VALUE* argv, VALUE obj)
   parser->lastAttrs = NULL;
 #endif
   parser->tainted = 0;
+  parser->detectedEncoding = NULL;
 
   return obj;
 }
 #endif
 
-/* parse method */
-static VALUE
-XMLParser_parse(int argc, VALUE* argv, VALUE obj)
-{
-  XMLParser* parser;
-  int ret;
+static void
+setup_evnet_handlers(XMLParser* parser, VALUE obj) {
   XML_StartElementHandler start = NULL;
   XML_EndElementHandler   end = NULL;
 #ifdef NEW_EXPAT
@@ -1525,38 +1547,6 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
   XML_StartDoctypeDeclHandler startDoctype = NULL;
   XML_EndDoctypeDeclHandler endDoctype = NULL;
 #endif
-  VALUE str;
-  VALUE isFinal;
-  int final = 1;
-  int count;
-  int fromStream = 0;
-  ID mid = rb_intern("gets");
-  ID linebuf = rb_intern("_linebuf");
-
-  count = rb_scan_args(argc, argv, "02", &str, &isFinal);
-  /* If "str" has public "gets" method, it will be considered *stream* */
-  if (!rb_obj_is_kind_of(str, rb_cString) &&
-      rb_method_boundp(CLASS_OF(str), mid, 1)) {
-    fromStream = 1;
-  }
-  else if (!NIL_P(str)) {
-    Check_Type(str, T_STRING);
-  }
-  if (count >= 2) {
-    if (isFinal == Qtrue)
-      final = 1;
-    else if (isFinal == Qfalse)
-      final = 0;
-    else
-      rb_raise(rb_eTypeError, "not valid value");
-  }
-
-  GET_PARSER(obj, parser);
-
-  //  parser->iterator = rb_iterator_p();
-  parser->iterator = rb_block_given_p();
-
-  /* Setup event handlers */
 
   /* Call as iterator */
   if (parser->iterator) {
@@ -1726,6 +1716,47 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
       XML_SetSkippedEntityHandler(parser->parser, mySkippedEntityHandler);
 #endif
   }
+}
+
+
+/* parse method */
+static VALUE
+XMLParser_parse(int argc, VALUE* argv, VALUE obj)
+{
+  XMLParser* parser;
+  int ret;
+  VALUE str;
+  VALUE isFinal;
+  int final = 1;
+  int count;
+  int fromStream = 0;
+  ID mid = rb_intern("gets");
+  ID linebuf = rb_intern("_linebuf");
+
+  count = rb_scan_args(argc, argv, "02", &str, &isFinal);
+  /* If "str" has public "gets" method, it will be considered *stream* */
+  if (!rb_obj_is_kind_of(str, rb_cString) &&
+      rb_method_boundp(CLASS_OF(str), mid, 1)) {
+    fromStream = 1;
+  }
+  else if (!NIL_P(str)) {
+    Check_Type(str, T_STRING);
+  }
+  if (count >= 2) {
+    if (isFinal == Qtrue)
+      final = 1;
+    else if (isFinal == Qfalse)
+      final = 0;
+    else
+      rb_raise(rb_eTypeError, "not valid value");
+  }
+
+  GET_PARSER(obj, parser);
+
+  parser->iterator = rb_block_given_p();
+
+  /* Setup event handlers */
+  setup_evnet_handlers(parser, obj);
 
   /* Parse from stream (probably slightly slow) */
   if (fromStream) {
@@ -1741,7 +1772,7 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
 	  taintParser(parser);
 	rb_ivar_set(obj, linebuf, buf); /* protect buf from GC (reasonable?)*/
 	ret = XML_Parse(parser->parser,
-			RSTRING(buf)->ptr, RSTRING(buf)->len, 0);
+			RSTRING_PTR(buf), RSTRING_LEN(buf), 0);
       }
       else {
 	ret = XML_Parse(parser->parser, NULL, 0, 1);
@@ -1757,10 +1788,41 @@ XMLParser_parse(int argc, VALUE* argv, VALUE obj)
 
   /* Parse string */
   if (!NIL_P(str)) {
+#if defined(HAVE_RUBY_ENCODING_H) && defined(HAVE_XML_PARSERRESET)
+    int err;
+#endif
     if (OBJ_TAINTED(str))
       taintParser(parser);
     ret = XML_Parse(parser->parser,
-		    RSTRING(str)->ptr, RSTRING(str)->len, final);
+		    RSTRING_PTR(str), RSTRING_LEN(str), final);
+#if defined(HAVE_RUBY_ENCODING_H) && defined(HAVE_XML_PARSERRESET)
+    /* Ruby 1.9.1 Encoding conversion */
+    err = XML_GetErrorCode(parser->parser);
+    if (final && err == XML_ERROR_UNKNOWN_ENCODING) {
+      rb_encoding* enc;
+      volatile VALUE encobj;
+      volatile VALUE ustr;
+      enc = rb_enc_find(parser->detectedEncoding);
+      if ((int)ENC_TO_ENCINDEX(enc) != rb_ascii8bit_encindex()) {
+        rb_enc_associate(str, enc);
+        encobj = rb_enc_from_encoding(enc_xml);
+        /* rb_str_encode may raises an exception */
+        ustr = rb_str_encode(str, encobj, 0, Qnil);
+        if (!NIL_P(ustr)) {
+          XML_ParserReset(parser->parser, "utf-8");
+          XML_SetUserData(parser->parser, (void*)obj);
+          parser->defaultCurrent = 0;
+#ifdef NEW_EXPAT
+          parser->lastAttrs = NULL;
+#endif
+          parser->detectedEncoding = NULL;
+          setup_evnet_handlers(parser, obj);
+          ret = XML_Parse(parser->parser,
+                          RSTRING_PTR(ustr), RSTRING_LEN(ustr), final);
+        }
+      }
+    }
+#endif
   }
   else
     ret = XML_Parse(parser->parser, NULL, 0, final);
@@ -1853,7 +1915,7 @@ XMLParser_setBase(VALUE obj, VALUE base)
   GET_PARSER(obj, parser);
   if (OBJ_TAINTED(base))
     taintParser(parser);
-  ret = XML_SetBase(parser->parser, RSTRING(base)->ptr);
+  ret = XML_SetBase(parser->parser, RSTRING_PTR(base));
 
   return INT2FIX(ret);
 }
@@ -1870,7 +1932,7 @@ XMLParser_getBase(VALUE obj)
   if (!ret)
     return Qnil;
 
-  return TO_(rb_str_new2((char*)ret));
+  return TO_(ENC_(rb_str_new2((char*)ret)));
 }
 
 #ifdef NEW_EXPAT
@@ -1892,7 +1954,7 @@ XMLParser_getSpecifiedAttributes(VALUE obj)
   while (*atts) {
     const char* key = *atts++;
     atts++;
-    rb_hash_aset(attrhash, FO_(TO_(rb_str_new2((char*)key))),
+    rb_hash_aset(attrhash, FO_(TO_(ENC_(rb_str_new2((char*)key)))),
 		 (count-- > 0) ? Qtrue: Qfalse);
   }
 
@@ -1915,7 +1977,7 @@ XMLParser_getSpecifiedAttributes(VALUE obj)
   attrarray = rb_ary_new2(count);
   for (i = 0; i < count; i++, atts+=2) {
     const char* key = *atts;
-    rb_ary_push(attrarray, TO_(rb_str_new2((char*)key)));
+    rb_ary_push(attrarray, TO_(ENC_(rb_str_new2((char*)key))));
   }
 
   return attrarray;
@@ -1951,13 +2013,13 @@ static VALUE
 XMLParser_s_expatVersion(VALUE obj)
 {
 #if defined(HAVE_EXPAT_H)
-  return rb_str_new2(XML_ExpatVersion());
+  return ENC_(rb_str_new2(XML_ExpatVersion()));
 #elif defined(EXPAT_1_2)
-  return rb_str_new2("1.2");
+  return ENC_(rb_str_new2("1.2"));
 #elif defined(NEW_EXPAT)
-  return rb_str_new2("1.1");
+  return ENC_(rb_str_new2("1.1"));
 #else
-  return rb_str_new2("1.0");
+  return ENC_(rb_str_new2("1.0"));
 #endif
 }
 
@@ -2003,7 +2065,7 @@ XMLParser_getInputContext(VALUE obj)
 			       &size);
   if (buffer && size > 0) {
     ret = rb_ary_new3(2,
-		      TO_(rb_str_new(buffer, size)),
+		      TO_(ENC_(rb_str_new(buffer, size))),
 		      INT2FIX(offset));
   }
 
@@ -2025,7 +2087,7 @@ XMLParser_getIdAttrribute(VALUE obj)
   idattr = XML_GetIdAttributeIndex(parser->parser);
   if (idattr < 0)
     return Qnil;
-  return TO_(rb_str_new2((char*)atts[idattr]));
+  return TO_(ENC_(rb_str_new2((char*)atts[idattr])));
 }
 #endif
 
@@ -2066,7 +2128,7 @@ XMLParser_s_getFeatureList(VALUE obj)
 
   list = XML_GetFeatureList();
   while (list && list->feature) {
-    rb_hash_aset(ret, FO_(rb_str_new2(list->name)), INT2NUM(list->value));
+    rb_hash_aset(ret, FO_(ENC_(rb_str_new2(list->name))), INT2NUM(list->value));
     list++;
   }
 
@@ -2079,6 +2141,10 @@ Init_xmlparser()
 {
   VALUE mXML;
 
+#ifdef HAVE_RUBY_ENCODING_H
+  enc_xml = rb_utf8_encoding();
+#endif
+
   eXMLParserError = rb_define_class("XMLParserError", rb_eStandardError);
   cXMLParser = rb_define_class("XMLParser", rb_cObject);
   cXMLEncoding = rb_define_class("XMLEncoding", rb_cObject);