libxml-ruby 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b6519d153d5b2c7dfeb51820c994b2d5594e96c
-  data.tar.gz: 53f1b868aa8c8834db3af1c1fc1bc79ac7f3babd
+  metadata.gz: 19bae1f5824f98a959ddf6f19674ac0f2a750388
+  data.tar.gz: 8a2003b0eed642100d6520306a3cf609b739b2a7
 SHA512:
-  metadata.gz: 4e91bc40ec03976a3f81fdc1376432c040503757317f14c998a41f31bdbddc0d08a339fa516e4ea089a9332d8454d053bef0a665cbefd1d9932cd1363e3d7d47
-  data.tar.gz: f41504c67abddf5ed8e8153bc8e55534020b9df2d71f58810351212291dbf78a082d6633636fdb002c16ea21e7c919c0327d88d078620780df1c85924b0a8c36
+  metadata.gz: 730aeb8b63e92c5b362853b34df0e0cd84b502d5425f29a55722f74ddb1e98eabdc29f53d66bf5434460d96fe415e3e03c52aa3f3a024fb358f6b9d16bc7576e
+  data.tar.gz: a1585ebfe236cfa867b2a936836fb828783fe6d839d2ab03f45bd8ecaa77abec080a5e6480ce5357674de4803888fa0257db27b30d50fe3f9a3951f504ad14a9

data/HISTORY

@@ -1,5 +1,20 @@
 = Release History
 
+== 2.9.0 / 2016-06-13 Charlie Savage
+
+* Revamp libxml-ruby's memory management to not cause crashes when used with Nokogiri (James Laird-Wah)
+* Fix garbage collection issue that sometimes caused the library to hang (Charlie Savage)
+* Improved multi-threading support (Charlie Savage)
+* Fix crash sometimes caused by a xml node being being freed twice (Charlie Savage)
+* Fix memory leak when setting the text content of a node (Charlie Savage)
+* Set a default task in the Rakefile - use "test" (Robert Haines)
+* Add "hanna_gudao" gem and add "rake-compiler" to develpoment dependencies (Robert Haines)
+* Use Process.getrlimit instead of `ulimit` in the tests (Robert Haines)
+* Build on smartos (Steven Williamson)
+* Fix compiler warnings (Charlie Savage)
+* Add Xcode project for easier debugging on OSX (Charlie Savage)
+* Switch from unit test to minitest (Charlie Savage)
+
 == 2.8.0 / 2015-01-09 Charlie Savage
 
 * Use RbConfig instead of Config in extconf.rb (Robert Haines)

data/README.rdoc

@@ -31,8 +31,8 @@ The easiest way to install libxml-ruby is via Ruby Gems.  To install:
 
 If you are running Windows, make sure to install the Win32 RubyGem
 which includes prebuilt extensions for Ruby 1.8, 1.9 and 2.0 preview.  These
-extensions are built with MinGW32 against libxml2 version 2.9.0,
-iconv version 1.13 and zlib version 1.2.5.  Note these binaries
+extensions are built using MinGW64 and libxml2 version 2.9.3,
+iconv version 1.14 and zlib version 1.2.8.  Note these binaries
 are available in the lib\libs directory.  To use them, put them
 someplace on your path.
 
@@ -114,8 +114,8 @@ For simplicity's sake, the documentation uses the xml module in its examples.
 
 == Memory Management
 libxml-ruby automatically manages memory associated with the
-underlying libxml2 library.  There is however one corner case that
-your code must handle.  If a node is imported into a document, but not
+underlying libxml2 library. There is however one corner case that
+your code must handle. If a node is imported into a document, but not
 added to the document, a segmentation fault may occur on program termination.
 
   # Do NOT do this
@@ -124,8 +124,8 @@ added to the document, a segmentation fault may occur on program termination.
   doc2 = XML::Document.string("test2")
   node = doc2.import(doc1.root)
 
-If doc2 is freed before node2 a segmentatin fault will occur since
-node2 references the document.  To avoid this, simply make sure to add the
+If doc2 is freed before the node a segmentation fault will occur since
+the node references the document.  To avoid this, simply make sure to add the
 node to the document:
 
   # DO this instead
@@ -133,7 +133,7 @@ node to the document:
   doc2 = XML::Document.string("test2")
   doc2.root << doc2.import(doc1.root)
 
-Alternatively, you can call node2.remove! to disassociate node2 from doc2.
+Alternatively, you can call node.remove! to disassociate the node from doc2.
 
 == Threading
 libxml-ruby fully supports native, background Ruby threads.  This of course

data/Rakefile

@@ -1,79 +1,81 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "rake/extensiontask"
-require "rake/testtask"
-require "rubygems/package_task"
-require "rdoc/task"
-require "yaml"
-
-GEM_NAME = "libxml-ruby"
-SO_NAME  = "libxml_ruby"
-
-# Read the spec file
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup compile tasks
-Rake::ExtensionTask.new do |ext|
-  ext.gem_spec = spec
-  ext.name = SO_NAME
-  ext.ext_dir = "ext/libxml"
-  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-  ext.config_options << "--with-xml2-include=C:/MinGW/local/include/libxml2"
-  ext.config_options << "--with-zlib-dir=C:/MinGW/local"
-end
-
-# Setup generic gem
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.package_dir = 'pkg'
-  pkg.need_tar    = false
-end
-
-# Setup Windows Gem
-if RUBY_PLATFORM.match(/win32|mingw32/)
-  binaries = (FileList['lib/**/*.so',
-                       'lib/**/*dll'])
-
-  # Windows specification
-  win_spec = spec.clone
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-  win_spec.instance_variable_set(:@cache_file, nil)
-
-  # Unset extensions
-  win_spec.extensions = nil
-
-  # Rake task to build the windows package
-  Gem::PackageTask.new(win_spec) do |pkg|
-    pkg.package_dir = 'pkg'
-    pkg.need_tar = false
-  end
-end
-
-# RDoc Task
-desc 'Generate rdoc documentation'
-RDoc::Task.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'website/_site/rdoc'
-  rdoc.title    = 'LibXML'
-  rdoc.generator = 'hanna'
-
-  # Show source inline with line numbers
-  rdoc.options << '--line-numbers'
-  rdoc.options << '--charset=utf-8'
-  # Make the readme file the start page for the generated html
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.include('doc/*.rdoc',
-                          'ext/**/libxml.c',
-                          'ext/**/ruby_xml.c',
-                          'ext/**/*.c',
-                          'lib/**/*.rb',
-                          'README.rdoc',
-                          'HISTORY',
-                          'LICENSE')
-end
-
-# Test Task
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.verbose = true
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "rake/extensiontask"
+require "rake/testtask"
+require "rubygems/package_task"
+require "rdoc/task"
+require "yaml"
+
+GEM_NAME = "libxml-ruby"
+SO_NAME  = "libxml_ruby"
+
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+task :default => [:test]
+
+# Setup compile tasks
+Rake::ExtensionTask.new do |ext|
+  ext.gem_spec = spec
+  ext.name = SO_NAME
+  ext.ext_dir = "ext/libxml"
+  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
+  ext.config_options << "--with-xml2-include=C:/msys64/mingw64/include/libxml2"
+  ext.config_options << "--with-zlib-dir=C:/msys64/mingw64"
+end
+
+# Setup generic gem
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_tar    = false
+end
+
+# Setup Windows Gem
+if RUBY_PLATFORM.match(/win32|mingw32/)
+  binaries = (FileList['lib/**/*.so',
+                       'lib/**/*dll'])
+
+  # Windows specification
+  win_spec = spec.clone
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
+  win_spec.instance_variable_set(:@cache_file, nil)
+
+  # Unset extensions
+  win_spec.extensions = nil
+
+  # Rake task to build the windows package
+  Gem::PackageTask.new(win_spec) do |pkg|
+    pkg.package_dir = 'pkg'
+    pkg.need_tar = false
+  end
+end
+
+# RDoc Task
+desc 'Generate rdoc documentation'
+RDoc::Task.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'website/_site/rdoc'
+  rdoc.title    = 'LibXML'
+  rdoc.generator = 'hanna'
+
+  # Show source inline with line numbers
+  rdoc.options << '--line-numbers'
+  rdoc.options << '--charset=utf-8'
+  # Make the readme file the start page for the generated html
+  rdoc.main = 'README.rdoc'
+  rdoc.rdoc_files.include('doc/*.rdoc',
+                          'ext/**/libxml.c',
+                          'ext/**/ruby_xml.c',
+                          'ext/**/*.c',
+                          'lib/**/*.rb',
+                          'README.rdoc',
+                          'HISTORY',
+                          'LICENSE')
+end
+
+# Test Task
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.verbose = true
 end

data/ext/libxml/extconf.h

@@ -0,0 +1,4 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#define HAVE_RB_IO_BUFWRITE 1
+#endif

data/ext/libxml/extconf.rb

@@ -1,116 +1,57 @@
-#!/usr/bin/env ruby
-
-require 'rbconfig'
-
-require 'mkmf'
-
-if defined?(CFLAGS)
-  if CFLAGS.index(CONFIG['CCDLFLAGS'])
-    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
-  else
-    $CFLAGS = CFLAGS
-  end
-else
-  $CFLAGS = CONFIG['CFLAGS']
-end
-$LDFLAGS = CONFIG['LDFLAGS']
-$LIBPATH.push(RbConfig::CONFIG['libdir'])
-
-def crash(str)
-  printf(" extconf failure: %s\n", str)
-  exit 1
-end
-
-dir_config('iconv')
-dir_config('zlib')
-
-have_library('socket','socket')
-have_library('nsl','gethostbyname')
-
-unless have_library('m', 'atan')
-  # try again for gcc 4.0
-  saveflags = $CFLAGS
-  $CFLAGS += ' -fno-builtin'
-  unless have_library('m', 'atan')
-    crash('need libm')
-  end
-  $CFLAGS = saveflags
-end
-
-unless have_library('z', 'inflate') or
-       have_library('zlib', 'inflate') or
-       have_library('zlib1', 'inflate') or
-       have_library('libz', 'inflate')
-  crash('need zlib')
-else
-  $defs.push('-DHAVE_ZLIB_H')
-end
-
-unless have_library('iconv','iconv_open') or 
-       have_library('iconv','libiconv_open') or
-       have_library('libiconv', 'libiconv_open') or
-       have_library('libiconv', 'iconv_open') or
-       have_library('c','iconv_open') or
-       have_library('recode','iconv_open') or
-       have_library('iconv')
-  crash(<<EOL)
-need libiconv.
-
-Install the libiconv or try passing one of the following options
-to extconf.rb:
-
-  --with-iconv-dir=/path/to/iconv
-  --with-iconv-lib=/path/to/iconv/lib
-  --with-iconv-include=/path/to/iconv/include
-EOL
-end
-
-if (xc = with_config('xml2-config')) or RUBY_PLATFORM.match(/darwin/i) then
-  xc = 'xml2-config' if xc == true or xc.nil?
-  cflags = `#{xc} --cflags`.chomp
-  if $? != 0
-		cflags = nil
-	else
-  	libs = `#{xc} --libs`.chomp
-  	if $? != 0
-			libs = nil
-		else
-  		$CFLAGS += ' ' + cflags
-  		$libs = libs + " " + $libs
-		end
-	end
-else
-	dir_config('xml2')
-end
-
-unless (have_library('xml2', 'xmlParseDoc') or
-				have_library('libxml2', 'xmlParseDoc') or
-				find_library('xml2', 'xmlParseDoc', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
-			 (have_header('libxml/xmlversion.h') or
-			  find_header('libxml/xmlversion.h',
-										'/opt/include/libxml2', 
-										'/usr/local/include/libxml2',
-										'/usr/include/libxml2'))
-		crash(<<EOL)
-need libxml2.
-
-    Install the library or try one of the following options to extconf.rb:
-
-      --with-xml2-config=/path/to/xml2-config
-      --with-xml2-dir=/path/to/libxml2
-      --with-xml2-lib=/path/to/libxml2/lib
-      --with-xml2-include=/path/to/libxml2/include
-EOL
-end
-
-have_func('rb_io_bufwrite', 'ruby/io.h')
-
-# For FreeBSD add /usr/local/include
-$INCFLAGS << " -I/usr/local/include"
-
-$CFLAGS << ' ' << $INCFLAGS
-
-#$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
-
-create_header()
-create_makefile('libxml_ruby')
+#!/usr/bin/env ruby
+
+require 'mkmf'
+
+def crash(str)
+  printf(" extconf failure: %s\n", str)
+  exit 1
+end
+
+xc = with_config('xml2-config')
+if xc
+  cflags = `#{xc} --cflags`.chomp
+  if $? != 0
+    cflags = nil
+  else
+    libs = `#{xc} --libs`.chomp
+    if $? != 0
+      libs = nil
+    else
+      $CFLAGS += ' ' + cflags
+      $libs = libs + " " + $libs
+    end
+  end
+else
+  dir_config('xml2')
+end
+
+unless find_header('libxml/xmlversion.h',
+                   '/opt/include/libxml2',
+                   '/opt/local/include/libxml2',
+                   '/usr/local/include/libxml2',
+                   '/usr/include/libxml2') &&
+        find_library('xml2', 'xmlParseDoc',
+                     '/opt/lib',
+                     '/opt/local/lib',
+                     '/usr/local/lib',
+                     '/usr/lib')
+    crash(<<EOL)
+need libxml2.
+
+    Install the library or try one of the following options to extconf.rb:
+
+      --with-xml2-config=/path/to/xml2-config
+      --with-xml2-dir=/path/to/libxml2
+      --with-xml2-lib=/path/to/libxml2/lib
+      --with-xml2-include=/path/to/libxml2/include
+EOL
+end
+
+have_func('rb_io_bufwrite', 'ruby/io.h')
+
+# For FreeBSD add /usr/local/include
+$INCFLAGS << " -I/usr/local/include"
+$CFLAGS << ' ' << $INCFLAGS
+
+create_header()
+create_makefile('libxml_ruby')

data/ext/libxml/libxml.c

@@ -39,6 +39,10 @@ void Init_libxml_ruby(void)
  * Refer to the README file to get started and the LICENSE file for
  * copyright and distribution information.
  */
+
+  // Seutp for threading. http://xmlsoft.org/threads.html
+  xmlInitParser();
+
   mLibXML = rb_define_module("LibXML");
 
   rxml_init_memory();

data/ext/libxml/ruby_xml.c

@@ -1,893 +1,977 @@
-#include "ruby_libxml.h"
-#include "ruby_xml.h"
-
-VALUE mXML;
-
-/*
- * call-seq:
- * 		XML.catalog_dump -> true
- *
- * Dump all the global catalog content stdout.
- */
-static VALUE rxml_catalog_dump(VALUE self)
-{
-  xmlCatalogDump(stdout);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.catalog_remove(catalog) -> true
- *
- * Remove the specified resource catalog.
- */
-static VALUE rxml_catalog_remove(VALUE self, VALUE cat)
-{
-  Check_Type(cat, T_STRING);
-  xmlCatalogRemove((xmlChar *) StringValuePtr(cat));
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.check_lib_versions -> true
- *
- * Check LIBXML version matches version the bindings
- * were compiled to. Throws an exception if not.
- */
-static VALUE rxml_check_lib_versions(VALUE klass)
-{
-  xmlCheckVersion(LIBXML_VERSION);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.enabled_automata? -> (true|false)
- *
- * Determine whether libxml regexp automata support is enabled.
- */
-static VALUE rxml_enabled_automata_q(VALUE klass)
-{
-#ifdef LIBXML_AUTOMATA_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_c14n? -> (true|false)
- *
- * Determine whether libxml 'canonical XML' support is enabled.
- * See "Canonical XML" (http://www.w3.org/TR/xml-c14n)
- */
-static VALUE rxml_enabled_c14n_q(VALUE klass)
-{
-#ifdef LIBXML_C14N_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_catalog? -> (true|false)
- *
- * Determine whether libxml resource catalog support is enabled.
- */
-static VALUE rxml_enabled_catalog_q(VALUE klass)
-{
-#ifdef LIBXML_CATALOG_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_debug? -> (true|false)
- *
- * Determine whether libxml debugging support is enabled.
- */
-static VALUE rxml_enabled_debug_q(VALUE klass)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_docbook? -> (true|false)
- *
- * Determine whether libxml docbook support is enabled.
- */
-static VALUE rxml_enabled_docbook_q(VALUE klass)
-{
-#ifdef LIBXML_DOCB_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_ftp? -> (true|false)
- *
- * Determine whether libxml ftp client support is enabled.
- */
-static VALUE rxml_enabled_ftp_q(VALUE klass)
-{
-#ifdef LIBXML_FTP_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_http? -> (true|false)
- *
- * Determine whether libxml http client support is enabled.
- */
-static VALUE rxml_enabled_http_q(VALUE klass)
-{
-#ifdef LIBXML_HTTP_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_html? -> (true|false)
- *
- * Determine whether libxml html support is enabled.
- */
-static VALUE rxml_enabled_html_q(VALUE klass)
-{
-#ifdef LIBXML_HTML_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_iconv? -> (true|false)
- *
- * Determine whether libxml iconv support is enabled.
- */
-static VALUE rxml_enabled_iconv_q(VALUE klass)
-{
-#ifdef LIBXML_ICONV_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_memory_debug? -> (true|false)
- *
- * Determine whether libxml memory location debugging support
- * is enabled.
- */
-static VALUE rxml_enabled_memory_debug_location_q(VALUE klass)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_regexp? -> (true|false)
- *
- * Determine whether libxml regular expression support is enabled.
- */
-static VALUE rxml_enabled_regexp_q(VALUE klass)
-{
-#ifdef LIBXML_REGEXP_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_schemas? -> (true|false)
- *
- * Determine whether libxml schema support is enabled.
- */
-static VALUE rxml_enabled_schemas_q(VALUE klass)
-{
-#ifdef LIBXML_SCHEMAS_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_thread? -> (true|false)
- *
- * Determine whether thread-safe semantics support for libxml is enabled and
- * is used by this ruby extension.  Threading support in libxml uses pthread
- * on Unix-like systems and Win32 threads on Windows.
- */
-static VALUE rxml_enabled_thread_q(VALUE klass)
-{
-  /* This won't be defined unless this code is compiled with _REENTRANT or __MT__
-   * defined or the compiler is in C99 mode.
-   *
-   * Note the relevant portion libxml/xmlversion.h on a thread-enabled build:
-   *
-   *    #if defined(_REENTRANT) || defined(__MT__) || \
-   *        (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))
-   *        #define LIBXML_THREAD_ENABLED
-   *    #endif
-   *
-   */
-#ifdef LIBXML_THREAD_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_unicode? -> (true|false)
- *
- * Determine whether libxml unicode support is enabled.
- */
-static VALUE rxml_enabled_unicode_q(VALUE klass)
-{
-#ifdef LIBXML_UNICODE_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xinclude? -> (true|false)
- *
- * Determine whether libxml xinclude support is enabled.
- */
-static VALUE rxml_enabled_xinclude_q(VALUE klass)
-{
-#ifdef LIBXML_XINCLUDE_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xpath? -> (true|false)
- *
- * Determine whether libxml xpath support is enabled.
- */
-static VALUE rxml_enabled_xpath_q(VALUE klass)
-{
-#ifdef LIBXML_XPATH_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xpointer? -> (true|false)
- *
- * Determine whether libxml xpointer support is enabled.
- */
-static VALUE rxml_enabled_xpointer_q(VALUE klass)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_zlib? -> (true|false)
- *
- * Determine whether libxml zlib support is enabled.
- */
-static VALUE rxml_enabled_zlib_q(VALUE klass)
-{
-#ifdef HAVE_ZLIB_H
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.debug_entities -> (true|false)
- *
- * Determine whether included-entity debugging is enabled.
- * (Requires Libxml to be compiled with debugging support)
- */
-static VALUE rxml_debug_entities_get(VALUE klass)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  if (xmlParserDebugEntities)
-  return(Qtrue);
-  else
-  return(Qfalse);
-#else
-  rb_warn("libxml was compiled with debugging turned off");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.debug_entities = true|false
- *
- * Enable or disable included-entity debugging.
- * (Requires Libxml to be compiled with debugging support)
- */
-static VALUE rxml_debug_entities_set(VALUE klass, VALUE bool)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlParserDebugEntities = 0;
-    return(Qfalse);
-  }
-  else
-  {
-    xmlParserDebugEntities = 1;
-    return(Qtrue);
-  }
-#else
-  rb_warn("libxml was compiled with debugging turned off");
-#endif
-}
-
-/*
- * call-seq:
- *    XML.default_keep_blanks -> (true|false)
- *
- * Determine whether parsers retain whitespace by default.
- */
-static VALUE rxml_default_keep_blanks_get(VALUE klass)
-{
-  if (xmlKeepBlanksDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_keep_blanks = true|false
- *
- * Controls whether parsers retain whitespace by default.
- */
-static VALUE rxml_default_keep_blanks_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlKeepBlanksDefaultValue = 0;
-    return (Qfalse);
-  }
-  else if (TYPE(bool) == T_TRUE)
-  {
-    xmlKeepBlanksDefaultValue = 1;
-    return (Qtrue);
-  }
-  else
-  {
-    rb_raise(rb_eArgError, "Invalid argument, must be a boolean");
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_load_external_dtd -> (true|false)
- *
- * Determine whether parsers load external DTDs by default.
- */
-static VALUE rxml_default_load_external_dtd_get(VALUE klass)
-{
-  if (xmlLoadExtDtdDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_load_external_dtd = true|false
- *
- * Controls whether parsers load external DTDs by default.
- */
-static VALUE rxml_default_load_external_dtd_set(VALUE klass, VALUE bool)
-{
-  if (bool == Qfalse)
-  {
-    xmlLoadExtDtdDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlLoadExtDtdDefaultValue = 1;
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_line_numbers -> (true|false)
- *
- * Determine whether parsers retain line-numbers by default.
- */
-static VALUE rxml_default_line_numbers_get(VALUE klass)
-{
-  if (xmlLineNumbersDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_line_numbers = true|false
- *
- * Controls whether parsers retain line-numbers by default.
- */
-static VALUE rxml_default_line_numbers_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlLineNumbersDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlLineNumbersDefault(1);
-    return (Qtrue);
-  }
-}
-
-int rxml_libxml_default_options()
-{
-  int options = 0;
-
-  if (xmlLoadExtDtdDefaultValue)
-    options |= XML_PARSE_DTDLOAD;
-
-  if (xmlDoValidityCheckingDefaultValue)
-    options |= XML_PARSE_DTDVALID;
-
-  if (!xmlKeepBlanksDefaultValue)
-    options |= XML_PARSE_NOBLANKS;
-
-  if (xmlSubstituteEntitiesDefaultValue)
-    options |= XML_PARSE_NOENT;
-
-  if (!xmlGetWarningsDefaultValue)
-    options |= XML_PARSE_NOWARNING;
-
-  if (xmlPedanticParserDefaultValue)
-    options |= XML_PARSE_PEDANTIC;
-  
-  return options;
-}
-
-/*
- * call-seq:
- *    XML.default_options -> int
- *
- * Returns an integer that summarize libxml2's default options.
- */
-static VALUE rxml_default_options_get(VALUE klass)
-{
-  int options = rxml_libxml_default_options();
-  return INT2NUM(options);
-}
-
-/*
- * call-seq:
- *    XML.default_pedantic_parser -> (true|false)
- *
- * Determine whether parsers are pedantic by default.
- */
-static VALUE rxml_default_pedantic_parser_get(VALUE klass)
-{
-  if (xmlPedanticParserDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_pedantic_parser = true|false
- *
- * Controls whether parsers are pedantic by default.
- */
-static VALUE rxml_default_pedantic_parser_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlPedanticParserDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlPedanticParserDefault(1);
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_substitute_entities -> (true|false)
- *
- * Determine whether parsers perform inline entity substitution
- * (for external entities) by default.
- */
-static VALUE rxml_default_substitute_entities_get(VALUE klass)
-{
-  if (xmlSubstituteEntitiesDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_substitute_entities = true|false
- *
- * Controls whether parsers perform inline entity substitution
- * (for external entities) by default.
- */
-static VALUE rxml_default_substitute_entities_set(VALUE klass, VALUE bool)
-{
-  if (bool == Qfalse)
-  {
-    xmlSubstituteEntitiesDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlSubstituteEntitiesDefault(1);
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_tree_indent_string -> "string"
- *
- * Obtain the default string used by parsers to indent the XML tree
- * for output.
- */
-static VALUE rxml_default_tree_indent_string_get(VALUE klass)
-{
-  if (xmlTreeIndentString == NULL)
-    return (Qnil);
-  else
-    return (rb_str_new2(xmlTreeIndentString));
-}
-
-/*
- * call-seq:
- *    XML.default_tree_indent_string = "string"
- *
- * Set the default string used by parsers to indent the XML tree
- * for output.
- */
-static VALUE rxml_default_tree_indent_string_set(VALUE klass, VALUE string)
-{
-  Check_Type(string, T_STRING);
-  xmlTreeIndentString = xmlStrdup((xmlChar *)StringValuePtr(string));
-  return (string);
-}
-
-/*
- * call-seq:
- *    XML.default_validity_checking -> (true|false)
- *
- * Determine whether parsers perform XML validation by default.
- */
-static VALUE rxml_default_validity_checking_get(VALUE klass)
-{
-  if (xmlDoValidityCheckingDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_validity_checking = true|false
- *
- * Controls whether parsers perform XML validation by default.
- */
-static VALUE rxml_default_validity_checking_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlDoValidityCheckingDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlDoValidityCheckingDefaultValue = 1;
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_warnings -> (true|false)
- *
- * Determine whether parsers output warnings by default.
- */
-static VALUE rxml_default_warnings_get(VALUE klass)
-{
-  if (xmlGetWarningsDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_warnings = true|false
- *
- * Controls whether parsers output warnings by default.
- */
-static VALUE rxml_default_warnings_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlGetWarningsDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlGetWarningsDefaultValue = 1;
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_compression -> (true|false)
- *
- * Determine whether parsers use Zlib compression by default
- * (requires libxml to be compiled with Zlib support).
- */
-static VALUE rxml_default_compression_get(VALUE klass)
-{
-#ifdef HAVE_ZLIB_H
-  return(INT2FIX(xmlGetCompressMode()));
-#else
-  rb_warn("libxml was compiled without zlib support");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.default_compression = true|false
- *
- * Controls whether parsers use Zlib compression by default
- * (requires libxml to be compiled with Zlib support).
- */
-static VALUE rxml_default_compression_set(VALUE klass, VALUE num)
-{
-#ifdef HAVE_ZLIB_H
-  Check_Type(num, T_FIXNUM);
-  xmlSetCompressMode(FIX2INT(num));
-  return(num);
-#else
-  rb_warn("libxml was compiled without zlib support");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.features -> ["feature", ..., "feature"]
- *
- * Obtains an array of strings representing features supported
- * (and enabled) by the installed libxml.
- */
-static VALUE rxml_features(VALUE klass)
-{
-  VALUE arr, str;
-  int i, len = MAX_LIBXML_FEATURES_LEN;
-  char **list = NULL;
-
-  list = ALLOC_N(char *,MAX_LIBXML_FEATURES_LEN);
-  MEMZERO(list, char *, MAX_LIBXML_FEATURES_LEN);
-
-  arr = rb_ary_new();
-  if (xmlGetFeaturesList(&len, (const char **) list) == -1)
-    return Qnil;
-
-  for (i = 0; i < len; i++)
-  {
-    str = rb_str_new2((const char *) list[i]);
-    rb_gc_unregister_address(&str);
-    rb_ary_push(arr, str);
-  }
-
-  if (len == MAX_LIBXML_FEATURES_LEN)
-    rb_warn(
-        "Please contact libxml-devel@rubyforge.org and ask to have the \"MAX_LIBXML_FEATURES_LEN increased\" because you could possibly be seeing an incomplete list");
-
-  ruby_xfree(list);
-  return (arr);
-}
-
-/*
- * call-seq:
- *    XML.indent_tree_output -> (true|false)
- *
- * Determines whether XML output will be indented
- * (using the string supplied to +default_indent_tree_string+)
- */
-static VALUE rxml_indent_tree_output_get(VALUE klass)
-{
-  if (xmlIndentTreeOutput)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.indent_tree_output = true|false
- *
- * Controls whether XML output will be indented
- * (using the string supplied to +default_indent_tree_string+)
- */
-static VALUE rxml_indent_tree_output_set(VALUE klass, VALUE bool)
-{
-  if (TYPE(bool) == T_TRUE)
-  {
-    xmlIndentTreeOutput = 1;
-    return (Qtrue);
-  }
-  else if (TYPE(bool) == T_FALSE)
-  {
-    xmlIndentTreeOutput = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    rb_raise(rb_eArgError, "Invalid argument, must be boolean");
-  }
-}
-
-/*
- * call-seq:
- *    XML.memory_dump -> (true|false)
- *
- * Perform a parser memory dump (requires memory debugging
- * support in libxml).
- */
-static VALUE rxml_memory_dump(VALUE self)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  xmlMemoryDump();
-  return(Qtrue);
-#else
-  rb_warn("libxml was compiled without memory debugging support");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.memory_used -> num_bytes
- *
- * Perform a parser memory dump (requires memory debugging
- * support in libxml).
- */
-static VALUE rxml_memory_used(VALUE self)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  return(INT2NUM(xmlMemUsed()));
-#else
-  rb_warn("libxml was compiled without memory debugging support");
-  return (Qfalse);
-#endif
-}
-
-/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
- * XML toolkit. Refer to the README file to get started
- * and the LICENSE file for copyright and distribution information.
-*/
-
-void rxml_init_xml(void)
-{
-  mXML = rb_define_module_under(mLibXML, "XML");
-
-  /* Constants */
-  rb_define_const(mXML, "LIBXML_VERSION", rb_str_new2(LIBXML_DOTTED_VERSION));
-  rb_define_const(mXML, "VERSION", rb_str_new2(RUBY_LIBXML_VERSION));
-  rb_define_const(mXML, "VERNUM", INT2NUM(RUBY_LIBXML_VERNUM));
-  rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*) XML_XML_NAMESPACE));
-
-  rb_define_module_function(mXML, "enabled_automata?", rxml_enabled_automata_q, 0);
-  rb_define_module_function(mXML, "enabled_c14n?", rxml_enabled_c14n_q, 0);
-  rb_define_module_function(mXML, "enabled_catalog?", rxml_enabled_catalog_q, 0);
-  rb_define_module_function(mXML, "enabled_debug?", rxml_enabled_debug_q, 0);
-  rb_define_module_function(mXML, "enabled_docbook?", rxml_enabled_docbook_q, 0);
-  rb_define_module_function(mXML, "enabled_ftp?", rxml_enabled_ftp_q, 0);
-  rb_define_module_function(mXML, "enabled_http?", rxml_enabled_http_q, 0);
-  rb_define_module_function(mXML, "enabled_html?", rxml_enabled_html_q, 0);
-  rb_define_module_function(mXML, "enabled_iconv?", rxml_enabled_iconv_q, 0);
-  rb_define_module_function(mXML, "enabled_memory_debug?", rxml_enabled_memory_debug_location_q, 0);
-  rb_define_module_function(mXML, "enabled_regexp?", rxml_enabled_regexp_q, 0);
-  rb_define_module_function(mXML, "enabled_schemas?", rxml_enabled_schemas_q, 0);
-  rb_define_module_function(mXML, "enabled_thread?", rxml_enabled_thread_q, 0);
-  rb_define_module_function(mXML, "enabled_unicode?", rxml_enabled_unicode_q, 0);
-  rb_define_module_function(mXML, "enabled_xinclude?", rxml_enabled_xinclude_q, 0);
-  rb_define_module_function(mXML, "enabled_xpath?", rxml_enabled_xpath_q, 0);
-  rb_define_module_function(mXML, "enabled_xpointer?", rxml_enabled_xpointer_q, 0);
-  rb_define_module_function(mXML, "enabled_zlib?", rxml_enabled_zlib_q, 0);
-
-  rb_define_module_function(mXML, "catalog_dump", rxml_catalog_dump, 0);
-  rb_define_module_function(mXML, "catalog_remove", rxml_catalog_remove, 1);
-  rb_define_module_function(mXML, "check_lib_versions", rxml_check_lib_versions, 0);
-  rb_define_module_function(mXML, "debug_entities", rxml_debug_entities_get, 0);
-  rb_define_module_function(mXML, "debug_entities=", rxml_debug_entities_set, 1);
-  rb_define_module_function(mXML, "default_compression", rxml_default_compression_get, 0);
-  rb_define_module_function(mXML, "default_compression=", rxml_default_compression_set, 1);
-  rb_define_module_function(mXML, "default_keep_blanks", rxml_default_keep_blanks_get, 0);
-  rb_define_module_function(mXML, "default_keep_blanks=", rxml_default_keep_blanks_set, 1);
-  rb_define_module_function(mXML, "default_load_external_dtd", rxml_default_load_external_dtd_get, 0);
-  rb_define_module_function(mXML, "default_load_external_dtd=", rxml_default_load_external_dtd_set, 1);
-  rb_define_module_function(mXML, "default_line_numbers", rxml_default_line_numbers_get, 0);
-  rb_define_module_function(mXML, "default_line_numbers=", rxml_default_line_numbers_set, 1);
-  rb_define_module_function(mXML, "default_options", rxml_default_options_get, 0);
-  rb_define_module_function(mXML, "default_pedantic_parser", rxml_default_pedantic_parser_get, 0);
-  rb_define_module_function(mXML, "default_pedantic_parser=", rxml_default_pedantic_parser_set, 1);
-  rb_define_module_function(mXML, "default_substitute_entities", rxml_default_substitute_entities_get, 0);
-  rb_define_module_function(mXML, "default_substitute_entities=", rxml_default_substitute_entities_set, 1);
-  rb_define_module_function(mXML, "default_tree_indent_string", rxml_default_tree_indent_string_get, 0);
-  rb_define_module_function(mXML, "default_tree_indent_string=", rxml_default_tree_indent_string_set, 1);
-  rb_define_module_function(mXML, "default_validity_checking", rxml_default_validity_checking_get, 0);
-  rb_define_module_function(mXML, "default_validity_checking=", rxml_default_validity_checking_set, 1);
-  rb_define_module_function(mXML, "default_warnings", rxml_default_warnings_get, 0);
-  rb_define_module_function(mXML, "default_warnings=", rxml_default_warnings_set, 1);
-  rb_define_module_function(mXML, "features", rxml_features, 0);
-  rb_define_module_function(mXML, "indent_tree_output", rxml_indent_tree_output_get, 0);
-  rb_define_module_function(mXML, "indent_tree_output=", rxml_indent_tree_output_set, 1);
-  rb_define_module_function(mXML, "memory_dump", rxml_memory_dump, 0);
-  rb_define_module_function(mXML, "memory_used", rxml_memory_used, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml.h"
+
+static struct st_table *private_pointers;
+
+static int registered = 0;   // Constant to track what nodes have been registered
+
+void rxml_register(void *xnode, VALUE value) {
+  st_insert(private_pointers, (st_data_t)xnode, (st_data_t)value);
+}
+
+void rxml_register_node(xmlNodePtr xnode, VALUE value) {
+  if (rxml_lookup_node(xnode) == Qnil) {
+    xnode->_private = &registered;
+    rxml_register(xnode, value);
+  }
+}
+
+void rxml_register_doc(xmlDocPtr xdoc, VALUE value) {
+  if (rxml_lookup_doc(xdoc) == Qnil) {
+    xdoc->_private = &registered;
+    rxml_register(xdoc, value);
+  }
+}
+
+void rxml_register_dtd(xmlDtdPtr xdtd, VALUE value) {
+  if (rxml_lookup_dtd(xdtd) == Qnil) {
+    xdtd->_private = &registered;
+    rxml_register(xdtd, value);
+  }
+}
+
+void rxml_unregister(void *xnode) {
+  st_delete(private_pointers, (st_data_t*)&xnode, NULL);
+}
+
+void rxml_unregister_node(xmlNodePtr xnode) {
+  if (xnode->_private == &registered) {
+    xnode->_private = NULL;
+    rxml_unregister(xnode);
+  }
+}
+
+void rxml_unregister_doc(xmlDocPtr xdoc) {
+  if (xdoc->_private == &registered) {
+    xdoc->_private = NULL;
+    rxml_unregister(xdoc);
+  }
+}
+
+void rxml_unregister_dtd(xmlDtdPtr xdtd) {
+  if (xdtd->_private == &registered) {
+    xdtd->_private = NULL;
+    rxml_unregister(xdtd);
+  }
+}
+
+VALUE rxml_lookup(void *pointer) {
+  st_data_t result = 0;
+  int ret = st_lookup(private_pointers, (st_data_t)pointer, &result);
+  return ret ? (VALUE)result : Qnil;
+}
+
+VALUE rxml_lookup_node(xmlNodePtr xnode) {
+  if (!xnode || xnode->_private != &registered)
+    return Qnil;
+
+  return rxml_lookup(xnode);
+}
+
+VALUE rxml_lookup_doc(xmlDocPtr xdoc) {
+  if (!xdoc || xdoc->_private != &registered)
+    return Qnil;
+
+  return rxml_lookup(xdoc);
+}
+
+VALUE rxml_lookup_dtd(xmlDtdPtr xdtd) {
+  if (!xdtd || xdtd->_private != &registered)
+    return Qnil;
+
+  return rxml_lookup(xdtd);
+}
+
+VALUE mXML;
+
+/*
+ * call-seq:
+ * 		XML.catalog_dump -> true
+ *
+ * Dump all the global catalog content stdout.
+ */
+static VALUE rxml_catalog_dump(VALUE self)
+{
+  xmlCatalogDump(stdout);
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ * 		XML.catalog_remove(catalog) -> true
+ *
+ * Remove the specified resource catalog.
+ */
+static VALUE rxml_catalog_remove(VALUE self, VALUE cat)
+{
+  Check_Type(cat, T_STRING);
+  xmlCatalogRemove((xmlChar *) StringValuePtr(cat));
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ * 		XML.check_lib_versions -> true
+ *
+ * Check LIBXML version matches version the bindings
+ * were compiled to. Throws an exception if not.
+ */
+static VALUE rxml_check_lib_versions(VALUE klass)
+{
+  xmlCheckVersion(LIBXML_VERSION);
+  return (Qtrue);
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_automata? -> (true|false)
+ *
+ * Determine whether libxml regexp automata support is enabled.
+ */
+static VALUE rxml_enabled_automata_q(VALUE klass)
+{
+#ifdef LIBXML_AUTOMATA_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_c14n? -> (true|false)
+ *
+ * Determine whether libxml 'canonical XML' support is enabled.
+ * See "Canonical XML" (http://www.w3.org/TR/xml-c14n)
+ */
+static VALUE rxml_enabled_c14n_q(VALUE klass)
+{
+#ifdef LIBXML_C14N_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_catalog? -> (true|false)
+ *
+ * Determine whether libxml resource catalog support is enabled.
+ */
+static VALUE rxml_enabled_catalog_q(VALUE klass)
+{
+#ifdef LIBXML_CATALOG_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_debug? -> (true|false)
+ *
+ * Determine whether libxml debugging support is enabled.
+ */
+static VALUE rxml_enabled_debug_q(VALUE klass)
+{
+#ifdef LIBXML_DEBUG_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_docbook? -> (true|false)
+ *
+ * Determine whether libxml docbook support is enabled.
+ */
+static VALUE rxml_enabled_docbook_q(VALUE klass)
+{
+#ifdef LIBXML_DOCB_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_ftp? -> (true|false)
+ *
+ * Determine whether libxml ftp client support is enabled.
+ */
+static VALUE rxml_enabled_ftp_q(VALUE klass)
+{
+#ifdef LIBXML_FTP_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_http? -> (true|false)
+ *
+ * Determine whether libxml http client support is enabled.
+ */
+static VALUE rxml_enabled_http_q(VALUE klass)
+{
+#ifdef LIBXML_HTTP_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_html? -> (true|false)
+ *
+ * Determine whether libxml html support is enabled.
+ */
+static VALUE rxml_enabled_html_q(VALUE klass)
+{
+#ifdef LIBXML_HTML_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_iconv? -> (true|false)
+ *
+ * Determine whether libxml iconv support is enabled.
+ */
+static VALUE rxml_enabled_iconv_q(VALUE klass)
+{
+#ifdef LIBXML_ICONV_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_memory_debug? -> (true|false)
+ *
+ * Determine whether libxml memory location debugging support
+ * is enabled.
+ */
+static VALUE rxml_enabled_memory_debug_location_q(VALUE klass)
+{
+#ifdef DEBUG_MEMORY_LOCATION
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_regexp? -> (true|false)
+ *
+ * Determine whether libxml regular expression support is enabled.
+ */
+static VALUE rxml_enabled_regexp_q(VALUE klass)
+{
+#ifdef LIBXML_REGEXP_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_schemas? -> (true|false)
+ *
+ * Determine whether libxml schema support is enabled.
+ */
+static VALUE rxml_enabled_schemas_q(VALUE klass)
+{
+#ifdef LIBXML_SCHEMAS_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_thread? -> (true|false)
+ *
+ * Determine whether thread-safe semantics support for libxml is enabled and
+ * is used by this ruby extension.  Threading support in libxml uses pthread
+ * on Unix-like systems and Win32 threads on Windows.
+ */
+static VALUE rxml_enabled_thread_q(VALUE klass)
+{
+  /* This won't be defined unless this code is compiled with _REENTRANT or __MT__
+   * defined or the compiler is in C99 mode.
+   *
+   * Note the relevant portion libxml/xmlversion.h on a thread-enabled build:
+   *
+   *    #if defined(_REENTRANT) || defined(__MT__) || \
+   *        (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))
+   *        #define LIBXML_THREAD_ENABLED
+   *    #endif
+   *
+   */
+#ifdef LIBXML_THREAD_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_unicode? -> (true|false)
+ *
+ * Determine whether libxml unicode support is enabled.
+ */
+static VALUE rxml_enabled_unicode_q(VALUE klass)
+{
+#ifdef LIBXML_UNICODE_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_xinclude? -> (true|false)
+ *
+ * Determine whether libxml xinclude support is enabled.
+ */
+static VALUE rxml_enabled_xinclude_q(VALUE klass)
+{
+#ifdef LIBXML_XINCLUDE_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_xpath? -> (true|false)
+ *
+ * Determine whether libxml xpath support is enabled.
+ */
+static VALUE rxml_enabled_xpath_q(VALUE klass)
+{
+#ifdef LIBXML_XPATH_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_xpointer? -> (true|false)
+ *
+ * Determine whether libxml xpointer support is enabled.
+ */
+static VALUE rxml_enabled_xpointer_q(VALUE klass)
+{
+#ifdef LIBXML_XPTR_ENABLED
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ * 		XML.enabled_zlib? -> (true|false)
+ *
+ * Determine whether libxml zlib support is enabled.
+ */
+static VALUE rxml_enabled_zlib_q(VALUE klass)
+{
+#ifdef HAVE_ZLIB_H
+  return(Qtrue);
+#else
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.debug_entities -> (true|false)
+ *
+ * Determine whether included-entity debugging is enabled.
+ * (Requires Libxml to be compiled with debugging support)
+ */
+static VALUE rxml_debug_entities_get(VALUE klass)
+{
+#ifdef LIBXML_DEBUG_ENABLED
+  if (xmlParserDebugEntities)
+  return(Qtrue);
+  else
+  return(Qfalse);
+#else
+  rb_warn("libxml was compiled with debugging turned off");
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.debug_entities = true|false
+ *
+ * Enable or disable included-entity debugging.
+ * (Requires Libxml to be compiled with debugging support)
+ */
+static VALUE rxml_debug_entities_set(VALUE klass, VALUE value)
+{
+#ifdef LIBXML_DEBUG_ENABLED
+  if (value == Qfalse)
+  {
+    xmlParserDebugEntities = 0;
+    return(Qfalse);
+  }
+  else
+  {
+    xmlParserDebugEntities = 1;
+    return(Qtrue);
+  }
+#else
+  rb_warn("libxml was compiled with debugging turned off");
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.default_keep_blanks -> (true|false)
+ *
+ * Determine whether parsers retain whitespace by default.
+ */
+static VALUE rxml_default_keep_blanks_get(VALUE klass)
+{
+  if (xmlKeepBlanksDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_keep_blanks = true|false
+ *
+ * Controls whether parsers retain whitespace by default.
+ */
+static VALUE rxml_default_keep_blanks_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlKeepBlanksDefaultValue = 0;
+    return (Qfalse);
+  }
+  else if (value == Qtrue)
+  {
+    xmlKeepBlanksDefaultValue = 1;
+    return (Qtrue);
+  }
+  else
+  {
+    rb_raise(rb_eArgError, "Invalid argument, must be a boolean");
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_load_external_dtd -> (true|false)
+ *
+ * Determine whether parsers load external DTDs by default.
+ */
+static VALUE rxml_default_load_external_dtd_get(VALUE klass)
+{
+  if (xmlLoadExtDtdDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_load_external_dtd = true|false
+ *
+ * Controls whether parsers load external DTDs by default.
+ */
+static VALUE rxml_default_load_external_dtd_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlLoadExtDtdDefaultValue = 0;
+    return (Qfalse);
+  }
+  else
+  {
+    xmlLoadExtDtdDefaultValue = 1;
+    return (Qtrue);
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_line_numbers -> (true|false)
+ *
+ * Determine whether parsers retain line-numbers by default.
+ */
+static VALUE rxml_default_line_numbers_get(VALUE klass)
+{
+  if (xmlLineNumbersDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_line_numbers = true|false
+ *
+ * Controls whether parsers retain line-numbers by default.
+ */
+static VALUE rxml_default_line_numbers_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlLineNumbersDefault(0);
+    return (Qfalse);
+  }
+  else
+  {
+    xmlLineNumbersDefault(1);
+    return (Qtrue);
+  }
+}
+
+int rxml_libxml_default_options()
+{
+  int options = 0;
+
+  if (xmlLoadExtDtdDefaultValue)
+    options |= XML_PARSE_DTDLOAD;
+
+  if (xmlDoValidityCheckingDefaultValue)
+    options |= XML_PARSE_DTDVALID;
+
+  if (!xmlKeepBlanksDefaultValue)
+    options |= XML_PARSE_NOBLANKS;
+
+  if (xmlSubstituteEntitiesDefaultValue)
+    options |= XML_PARSE_NOENT;
+
+  if (!xmlGetWarningsDefaultValue)
+    options |= XML_PARSE_NOWARNING;
+
+  if (xmlPedanticParserDefaultValue)
+    options |= XML_PARSE_PEDANTIC;
+  
+  return options;
+}
+
+/*
+ * call-seq:
+ *    XML.default_options -> int
+ *
+ * Returns an integer that summarize libxml2's default options.
+ */
+static VALUE rxml_default_options_get(VALUE klass)
+{
+  int options = rxml_libxml_default_options();
+  return INT2NUM(options);
+}
+
+/*
+ * call-seq:
+ *    XML.default_pedantic_parser -> (true|false)
+ *
+ * Determine whether parsers are pedantic by default.
+ */
+static VALUE rxml_default_pedantic_parser_get(VALUE klass)
+{
+  if (xmlPedanticParserDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_pedantic_parser = true|false
+ *
+ * Controls whether parsers are pedantic by default.
+ */
+static VALUE rxml_default_pedantic_parser_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlPedanticParserDefault(0);
+    return (Qfalse);
+  }
+  else
+  {
+    xmlPedanticParserDefault(1);
+    return (Qtrue);
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_substitute_entities -> (true|false)
+ *
+ * Determine whether parsers perform inline entity substitution
+ * (for external entities) by default.
+ */
+static VALUE rxml_default_substitute_entities_get(VALUE klass)
+{
+  if (xmlSubstituteEntitiesDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_substitute_entities = true|false
+ *
+ * Controls whether parsers perform inline entity substitution
+ * (for external entities) by default.
+ */
+static VALUE rxml_default_substitute_entities_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlSubstituteEntitiesDefault(0);
+    return (Qfalse);
+  }
+  else
+  {
+    xmlSubstituteEntitiesDefault(1);
+    return (Qtrue);
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_tree_indent_string -> "string"
+ *
+ * Obtain the default string used by parsers to indent the XML tree
+ * for output.
+ */
+static VALUE rxml_default_tree_indent_string_get(VALUE klass)
+{
+  if (xmlTreeIndentString == NULL)
+    return (Qnil);
+  else
+    return (rb_str_new2(xmlTreeIndentString));
+}
+
+/*
+ * call-seq:
+ *    XML.default_tree_indent_string = "string"
+ *
+ * Set the default string used by parsers to indent the XML tree
+ * for output.
+ */
+static VALUE rxml_default_tree_indent_string_set(VALUE klass, VALUE string)
+{
+  Check_Type(string, T_STRING);
+  xmlTreeIndentString = (const char *)xmlStrdup((xmlChar *)StringValuePtr(string));
+  return (string);
+}
+
+/*
+ * call-seq:
+ *    XML.default_validity_checking -> (true|false)
+ *
+ * Determine whether parsers perform XML validation by default.
+ */
+static VALUE rxml_default_validity_checking_get(VALUE klass)
+{
+  if (xmlDoValidityCheckingDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_validity_checking = true|false
+ *
+ * Controls whether parsers perform XML validation by default.
+ */
+static VALUE rxml_default_validity_checking_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlDoValidityCheckingDefaultValue = 0;
+    return (Qfalse);
+  }
+  else
+  {
+    xmlDoValidityCheckingDefaultValue = 1;
+    return (Qtrue);
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_warnings -> (true|false)
+ *
+ * Determine whether parsers output warnings by default.
+ */
+static VALUE rxml_default_warnings_get(VALUE klass)
+{
+  if (xmlGetWarningsDefaultValue)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_warnings = true|false
+ *
+ * Controls whether parsers output warnings by default.
+ */
+static VALUE rxml_default_warnings_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlGetWarningsDefaultValue = 0;
+    return (Qfalse);
+  }
+  else
+  {
+    xmlGetWarningsDefaultValue = 1;
+    return (Qtrue);
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.default_compression -> (true|false)
+ *
+ * Determine whether parsers use Zlib compression by default
+ * (requires libxml to be compiled with Zlib support).
+ */
+static VALUE rxml_default_compression_get(VALUE klass)
+{
+#ifdef HAVE_ZLIB_H
+  return(INT2FIX(xmlGetCompressMode()));
+#else
+  rb_warn("libxml was compiled without zlib support");
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.default_compression = true|false
+ *
+ * Controls whether parsers use Zlib compression by default
+ * (requires libxml to be compiled with Zlib support).
+ */
+static VALUE rxml_default_compression_set(VALUE klass, VALUE num)
+{
+#ifdef HAVE_ZLIB_H
+  Check_Type(num, T_FIXNUM);
+  xmlSetCompressMode(FIX2INT(num));
+  return(num);
+#else
+  rb_warn("libxml was compiled without zlib support");
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.features -> ["feature", ..., "feature"]
+ *
+ * Obtains an array of strings representing features supported
+ * (and enabled) by the installed libxml.
+ */
+static VALUE rxml_features(VALUE klass)
+{
+  VALUE arr, str;
+  int i, len = MAX_LIBXML_FEATURES_LEN;
+  char **list = NULL;
+
+  list = ALLOC_N(char *,MAX_LIBXML_FEATURES_LEN);
+  MEMZERO(list, char *, MAX_LIBXML_FEATURES_LEN);
+
+  arr = rb_ary_new();
+  if (xmlGetFeaturesList(&len, (const char **) list) == -1)
+    return Qnil;
+
+  for (i = 0; i < len; i++)
+  {
+    str = rb_str_new2((const char *) list[i]);
+    rb_gc_unregister_address(&str);
+    rb_ary_push(arr, str);
+  }
+
+  if (len == MAX_LIBXML_FEATURES_LEN)
+    rb_warn(
+        "Please contact libxml-devel@rubyforge.org and ask to have the \"MAX_LIBXML_FEATURES_LEN increased\" because you could possibly be seeing an incomplete list");
+
+  ruby_xfree(list);
+  return (arr);
+}
+
+/*
+ * call-seq:
+ *    XML.indent_tree_output -> (true|false)
+ *
+ * Determines whether XML output will be indented
+ * (using the string supplied to +default_indent_tree_string+)
+ */
+static VALUE rxml_indent_tree_output_get(VALUE klass)
+{
+  if (xmlIndentTreeOutput)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.indent_tree_output = true|false
+ *
+ * Controls whether XML output will be indented
+ * (using the string supplied to +default_indent_tree_string+)
+ */
+static VALUE rxml_indent_tree_output_set(VALUE klass, VALUE value)
+{
+  if (value == Qtrue)
+  {
+    xmlIndentTreeOutput = 1;
+    return (Qtrue);
+  }
+  else if (value == Qfalse)
+  {
+    xmlIndentTreeOutput = 0;
+    return (Qfalse);
+  }
+  else
+  {
+    rb_raise(rb_eArgError, "Invalid argument, must be boolean");
+  }
+}
+
+/*
+ * call-seq:
+ *    XML.memory_dump -> (true|false)
+ *
+ * Perform a parser memory dump (requires memory debugging
+ * support in libxml).
+ */
+static VALUE rxml_memory_dump(VALUE self)
+{
+#ifdef DEBUG_MEMORY_LOCATION
+  xmlMemoryDump();
+  return(Qtrue);
+#else
+  rb_warn("libxml was compiled without memory debugging support");
+  return (Qfalse);
+#endif
+}
+
+/*
+ * call-seq:
+ *    XML.memory_used -> num_bytes
+ *
+ * Perform a parser memory dump (requires memory debugging
+ * support in libxml).
+ */
+static VALUE rxml_memory_used(VALUE self)
+{
+#ifdef DEBUG_MEMORY_LOCATION
+  return(INT2NUM(xmlMemUsed()));
+#else
+  rb_warn("libxml was compiled without memory debugging support");
+  return (Qfalse);
+#endif
+}
+
+/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
+ * XML toolkit. Refer to the README file to get started
+ * and the LICENSE file for copyright and distribution information.
+*/
+
+void rxml_init_xml(void)
+{
+  /* Create a hashtable suitable for pointer keys */
+  private_pointers = st_init_numtable();
+
+  mXML = rb_define_module_under(mLibXML, "XML");
+
+  /* Constants */
+  rb_define_const(mXML, "LIBXML_VERSION", rb_str_new2(LIBXML_DOTTED_VERSION));
+  rb_define_const(mXML, "VERSION", rb_str_new2(RUBY_LIBXML_VERSION));
+  rb_define_const(mXML, "VERNUM", INT2NUM(RUBY_LIBXML_VERNUM));
+  rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*) XML_XML_NAMESPACE));
+
+  rb_define_module_function(mXML, "enabled_automata?", rxml_enabled_automata_q, 0);
+  rb_define_module_function(mXML, "enabled_c14n?", rxml_enabled_c14n_q, 0);
+  rb_define_module_function(mXML, "enabled_catalog?", rxml_enabled_catalog_q, 0);
+  rb_define_module_function(mXML, "enabled_debug?", rxml_enabled_debug_q, 0);
+  rb_define_module_function(mXML, "enabled_docbook?", rxml_enabled_docbook_q, 0);
+  rb_define_module_function(mXML, "enabled_ftp?", rxml_enabled_ftp_q, 0);
+  rb_define_module_function(mXML, "enabled_http?", rxml_enabled_http_q, 0);
+  rb_define_module_function(mXML, "enabled_html?", rxml_enabled_html_q, 0);
+  rb_define_module_function(mXML, "enabled_iconv?", rxml_enabled_iconv_q, 0);
+  rb_define_module_function(mXML, "enabled_memory_debug?", rxml_enabled_memory_debug_location_q, 0);
+  rb_define_module_function(mXML, "enabled_regexp?", rxml_enabled_regexp_q, 0);
+  rb_define_module_function(mXML, "enabled_schemas?", rxml_enabled_schemas_q, 0);
+  rb_define_module_function(mXML, "enabled_thread?", rxml_enabled_thread_q, 0);
+  rb_define_module_function(mXML, "enabled_unicode?", rxml_enabled_unicode_q, 0);
+  rb_define_module_function(mXML, "enabled_xinclude?", rxml_enabled_xinclude_q, 0);
+  rb_define_module_function(mXML, "enabled_xpath?", rxml_enabled_xpath_q, 0);
+  rb_define_module_function(mXML, "enabled_xpointer?", rxml_enabled_xpointer_q, 0);
+  rb_define_module_function(mXML, "enabled_zlib?", rxml_enabled_zlib_q, 0);
+
+  rb_define_module_function(mXML, "catalog_dump", rxml_catalog_dump, 0);
+  rb_define_module_function(mXML, "catalog_remove", rxml_catalog_remove, 1);
+  rb_define_module_function(mXML, "check_lib_versions", rxml_check_lib_versions, 0);
+  rb_define_module_function(mXML, "debug_entities", rxml_debug_entities_get, 0);
+  rb_define_module_function(mXML, "debug_entities=", rxml_debug_entities_set, 1);
+  rb_define_module_function(mXML, "default_compression", rxml_default_compression_get, 0);
+  rb_define_module_function(mXML, "default_compression=", rxml_default_compression_set, 1);
+  rb_define_module_function(mXML, "default_keep_blanks", rxml_default_keep_blanks_get, 0);
+  rb_define_module_function(mXML, "default_keep_blanks=", rxml_default_keep_blanks_set, 1);
+  rb_define_module_function(mXML, "default_load_external_dtd", rxml_default_load_external_dtd_get, 0);
+  rb_define_module_function(mXML, "default_load_external_dtd=", rxml_default_load_external_dtd_set, 1);
+  rb_define_module_function(mXML, "default_line_numbers", rxml_default_line_numbers_get, 0);
+  rb_define_module_function(mXML, "default_line_numbers=", rxml_default_line_numbers_set, 1);
+  rb_define_module_function(mXML, "default_options", rxml_default_options_get, 0);
+  rb_define_module_function(mXML, "default_pedantic_parser", rxml_default_pedantic_parser_get, 0);
+  rb_define_module_function(mXML, "default_pedantic_parser=", rxml_default_pedantic_parser_set, 1);
+  rb_define_module_function(mXML, "default_substitute_entities", rxml_default_substitute_entities_get, 0);
+  rb_define_module_function(mXML, "default_substitute_entities=", rxml_default_substitute_entities_set, 1);
+  rb_define_module_function(mXML, "default_tree_indent_string", rxml_default_tree_indent_string_get, 0);
+  rb_define_module_function(mXML, "default_tree_indent_string=", rxml_default_tree_indent_string_set, 1);
+  rb_define_module_function(mXML, "default_validity_checking", rxml_default_validity_checking_get, 0);
+  rb_define_module_function(mXML, "default_validity_checking=", rxml_default_validity_checking_set, 1);
+  rb_define_module_function(mXML, "default_warnings", rxml_default_warnings_get, 0);
+  rb_define_module_function(mXML, "default_warnings=", rxml_default_warnings_set, 1);
+  rb_define_module_function(mXML, "features", rxml_features, 0);
+  rb_define_module_function(mXML, "indent_tree_output", rxml_indent_tree_output_get, 0);
+  rb_define_module_function(mXML, "indent_tree_output=", rxml_indent_tree_output_set, 1);
+  rb_define_module_function(mXML, "memory_dump", rxml_memory_dump, 0);
+  rb_define_module_function(mXML, "memory_used", rxml_memory_used, 0);
+}