nokogiri 1.6.0-x86-mswin32-60 → 1.6.1-x86-mswin32-60

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: b5f6510a98c8a50da555c92356141215c5e719227f030a581caab05dca1ac5b5c7706d45f9bbee4ed975cfff3140c5546cbe3be84e7f12a4418bf5dcaa51edca
+  data.tar.gz: 6c6a770151b3e2f96c3e71a83280470798994b7286a9a0ec9c16c6a0c660635d6648c8b9a99ec70238ab25e72a7255f5d86e159b4ae22141b118fbe816deec8d
+SHA1: 
+  metadata.gz: ceb8a8f51f2f2bdc031df7b9de853dd8a3bd5733
+  data.tar.gz: c417121cdb69ea067f1685795f2a6ccac18aa94d

data/CHANGELOG.ja.rdoc

@@ -1,22 +1,25 @@
-=== 1.6.1 / 未リリース
+=== 1.6.1 / 2013年12月14日
 
-* 機能
+* Bugfixes
 
-  * FreeBSDなど、libiconvがシステム標準ディレクトリ外にある環境でlibxml2がiconvサポート付きで正しくビルドされるようになった
+  * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
+  * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
 === 1.6.0 / 2013年6月8日
 
-本リリースは1.5.10および1.6.0.rc1を元にしているため、両リリースの改善点を含む
+This release was based on v1.5.10 and 1.6.0.rc1, and contains changes
+mentioned in both.
 
 * 廃止
 
-  * TravisのCI対象からRuby 1.8を外した
+  * Remove pre 1.9 monitoring from Travis.
 
 
 === 1.6.0.rc1 / 2013年4月14日
 
-本リリースは1.5.9を元にしているため、1.5.10の変更点は含まない
+This release was based on v1.5.9, and so does not contain any fixes
+mentioned in the notes for v1.5.10.
 
 * 註
 
@@ -28,7 +31,7 @@
 
   * (MRI) libxml 2.8.0 と libxslt 1.2.26 を同梱。
     環境変数 NOKOGIRI_USE_SYSTEM_LIBRARIES を設定しない限り、 gem のインストール時にコンパイルして使われる。
-    VERSION_INFO (および `nokogiri -v`) には、同梱の libxml またはシステムの libxml のいずれが使われているかの情報が含まれる
+    VERSION_INFO (および `nokogiri -v`) には、同梱の libxml またはシステムの libxml のいずれが使われているかの情報が含まれる。
   * (Windows) libxml 2.8.0 に更新
 
 
@@ -37,6 +40,14 @@
   * Ruby 1.8.7以下のサポートを終了
 
 
+=== 1.5.11 / 2013-11-09
+
+* Bugfixes
+
+  * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
+  * (JRuby) Fix regression of billion-laughs vulnerability. #568
+
+
 === 1.5.10 / 2013年6月7日
 
 * バグ修正
@@ -114,7 +125,7 @@
   * SAXパーザに不正なエンコーディングに渡された場合はArgumentErrorを投げるようにした。#756 (ありがとう、Bradley Schaefer!)
   * (JRuby) XML宣言の前にスペースがあると、ドキュメントのパーズに失敗する。(#748の修正でこれもなおっている) #790
   * (JRuby) Nokogiri::XML::Node#content のJRubyの振る舞いがCRubyと同じではない。#794, #797
-  * (JRuby) で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外がはっせいする。 #719
+  * (JRuby) で '#' で始まる文字列を名前とする EntityReference を作ろうとすると INVALID_CHARACTER_ERR という例外が発生する。 #719
   * (JRuby) では Nodeのサブクラスのnamespaceを正しく文字列に変換しない。 #715
   * (JRuby) Node#contentがこのバージョンから改行コードを正しく表示するようになった。#737 (ありがとう、Piotr Szmielew!)
   * (JRuby) recover optionが指定されている場合は宣言の無い名前空間を無視するようにした。#748
@@ -147,7 +158,7 @@
   * JRuby で US-ASCII にエンコードされた文字列が正しくないエンコードを返してくる。 #583
   * 512 文字以上が与えられたときに XmlSaxPushParser が IndexOutOfBoundsException を投げる。#567, #615
   * Xpath を評価した結果、空の NodeSet が帰ってくる場合に、NodeSet が持っている Document の decorate に失敗して例外が投げられる。#514
-  * JRuby で xpath を namespace 付きで指定した場合に、エラーが発生する。pull request #681 (ありがとう, Piotr Szmielew) 
+  * JRuby で xpath を namespace 付きで指定した場合に、エラーが発生する。pull request #681 (ありがとう, Piotr Szmielew)
   * JRuby で Nokogiri::XML::Node を継承したクラスを定義すると、namespace が表示されない。 #695
   * JRuby で RDF::RDFXML::Writer をインスタンス化しようとすると NAMESPACE_ERR (org.w3c.dom.DOMException) が発生する. #683
   * JRuby で xpath に namespaces を指定すると例外が発生する. #493
@@ -174,7 +185,7 @@
     パース時にネットワークに接続して外部のドキュメントを見にいかせたい場合には、以下のように `nonoet` オプションを設定する:
 
     Nokogiri::XML::Document.parse(xml) { |config| config.nononet }
-    
+
     ここに、自分ならではの二重否定のジョークをうめこむとなおよし。
 
 
@@ -211,45 +222,38 @@
 * 新機能
 
   * XML::Builder#comment はコメントノードを作れるようになった.
-  * CSS searches now support namespaced attributes. #593
-  * Java integration 機能が追加された. このバージョンから, 
+  * CSSセレクター検索が名前空間付き属性に対応 #593
+  * Java integration 機能が追加された. このバージョンから,
     XML::Document.wrap と XML::Document#to_java メソッドが利用可能。
-  * RelaxNG validator support in the `nokogiri` cli utility. #591 (thanks, Dan Radez!)
+  * `nokogiri` CLIユーティリティがRelaxNGバリデーションに対応 #591 (thanks, Dan Radez!)
 
 * バグの修正
 
-  * エンコーディング自動認識において発生しうるメモリリークを修正.
+  * エンコーディング自動認識において発生しうるメモリリークを修正
     Tim Elliottに感謝！
-  * homebrew はインストールしたら、extconf は homebrew のパスを読む。
-  * Inconsistent behavior of Nokogiri 1.5.0 Java #620
-  * Inheriting from Nokogiri::XML::Node on JRuby (1.6.4/5) fails #560
-  * XML::Attr nodes are not allowed to be added as node children, so an
-    exception is raised. #558
-  * No longer defensively "pickle" adjacent text nodes on
-    Node#add_next_sibling and Node#add_previous_sibling calls. #595.
-  * Java version inconsistency: it returns nil for empty attributes #589
-  * to_xhtml incorrectly generates <p /></p> when tag is empty #557
-  * Document#add_child now accepts a Node, NodeSet, DocumentFragment,
-    or String. #546.
-  * Document#create_element now recognizes namespaces containing
-    non-word characters (like "SOAP-ENV"). This is mostly relevant to
-    users of Builder, which calls Document#create_element for nearly
-    everything. #531.
-  * File encoding broken in 1.5.0 / jruby / windows #529
-  * Java version does not return namespace defs as attrs for ::HTML #542
-  * Bad file descriptor with Nokogiri 1.5.0 #495
-  * remove_namespace! doesn't work in pure java version #492
-  * The Nokogiri Java native build throws a null pointer exception when
-    ActiveSupport's .blank? method is called directly on a parsed object.
-    #489
-  * 1.5.0 Not using correct character encoding #488
-  * Raw XML string in XML Builder broken on JRuby #486
-  * Nokogiri 1.5.0 XML generation broken on JRuby #484
-  * Do not allow multiple root nodes. #550
-  * Fixes for custom XPath functions. #605, #606 (thanks, Juan Wajnerman!)
-  * Node#to_xml does not override :save_with if it is provided. #505
-  * Node#set is a private method (JRuby). #564 (thanks, Nick Sieger!)
-  * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
+  * homebrew がインストールされていたら、extconf は homebrew のパスを読む。
+  * Java版の一貫性のない挙動 #620
+  * JRuby (1.6.4/5) で Nokogiri::XML::Node を継承できなかった #560
+  * XML::Attr ノードは子ノードとして追加できないので例外を出す #558
+  * Node#add_next_sibling と Node#add_previous_sibling で隣接テキストノードをdupする条件を緩和 #595
+  * Java版の一貫性のない挙動: 空の属性値をnilとして返していた #589
+  * to_xhtml が要素が空のときに <p /></p> と誤ったタグを生成していた #557
+  * Document#add_child が Node, NodeSet, DocumentFragment および
+    String を受け付けるようになった #546
+  * Document#create_element が("SOAP-ENV"のように)非単語構成文字を含む名前空間を認識するようになった. これは主に Builder を使う際に効いてくる. Builder はほぼすべてのものに Document#create_element を適用するためである #531
+  * ファイルエンコーディングが効かなかった (1.5.0 / jruby / windows) #529
+  * Java版において、<html>タグに含まれる名前空間定義を属性として返さなかった #542
+  * Nokogiri 1.5.0で Bad file descriptor が発生していた #495
+  * remove_namespace! がpure Java版で動かなかった #492
+  * Javaネイティブ版でパースされたオブジェクトに対して ActiveSupport の .blank? メソッドを呼ぶと null pointer exception が発生していた #489
+  * 1.5.0 で正しい文字エンコーディングが仕様されなかった #488
+  * XML Builder に生のXML文字列を渡した際の問題 (JRuby) #486
+  * Nokogiri 1.5.0でXML生成が壊れていた (JRuby) #484
+  * ルートノードを複数持つことを認めない #550
+  * カスタムXPath関数を修正 #606 (Juan Wajnermanに感謝!)
+  * Node#to_xml で :save_with が指定されている場合は上書きしないように修正 #505
+  * Node#set をプライベートメソッドに (JRuby) #564 (Nick Siegerに感謝!)
+  * C14nの整理と Node#canonicalize (Ivan Pirlikに感謝!) #563
 
 
 === 1.5.0 / 2011年7月1日
@@ -433,7 +437,7 @@
 
 * ノート
 
-  * 今日４月１８日現在、Windows gems は libxml 2.7.7 とlibxslt
+  * 今日4月18日現在、Windows gems は libxml 2.7.7 とlibxslt
     1.1.26にDLLsを標準装備しています。このリリース以前にも既にDLLsはlibxml
     2.7.3 と libxslt 1.1.24に標準装備済み。
 
@@ -725,26 +729,26 @@
 
 * バグの修正
 
-  * HTML のノードを \r のエンティティを含まない
+  * HTML のノードに \r のエンティティを含めない
   * CSS::SelectorHandler と XML::XPathHandler を除去
-  * XML::Node#attributes が Attr node を value値に返す
-  * XML::NodeSet が to_xml へ実行
+  * XML::Node#attributes が Attr node を値として返す
+  * XML::NodeSet が to_xml を実装
 
 
 === 1.1.0
 
 * 新しい機能
 
-  * カスタム XPath 機能はある。（ Nokogiri::XML::Node#xpath 参照 ）
-  * カスタム CSS 擬似クラスと機能はある。（ Nokogiri::XML::Node#css 参照 ）
+  * カスタム XPath 機能を追加。（ Nokogiri::XML::Node#xpath 参照 ）
+  * カスタム CSS 擬似クラスと機能を追加。（ Nokogiri::XML::Node#css 参照 ）
   * Nokogiri::XML::Node#<< が作成中に子ノードを自動追加
 
 * バグの修正
 
   * mutex が CSS のキャッシュのアクセスをロックする
   * GCC 3.3.5 のビルドに関する問題を修正
-  * XML::Node#to_xml が引数indentationを取る 
-  * XML::Node#dup が引数任意のdepthを取る 
+  * XML::Node#to_xml が引数indentationを取る
+  * XML::Node#dup が引数任意のdepthを取る
   * XML::Node#add_previous_sibling が新しい兄弟ノードで返す
 
 
@@ -753,10 +757,10 @@
 * バグの修正
 
   * Dike 使用時中のメモリーリークの修正
-  * SAX パーサーが現在 IO Stream 同時解析
+  * SAX パーサーが IO Stream を逐次解析
   * コメント nodes が独自のクラスを継承する
   * Nokogiri() は Nokogiri.parse() へデリゲートする
-  * ENV['PATH'] に付加せれる代わりに先頭へデータ挿入される
+  * ENV['PATH'] に付加する代わりに先頭へ挿入する (Windows)
   * 複雑な CSS 内のバグを修正完了 :not selector ではありません
 
 
@@ -775,7 +779,7 @@
 
 * バグフィックス
 
-  * メーリンクリストを作成
+  * メーリングリストを作成
   * バグファイルを作成
   * Windows 内で ENV['PATH'] が存在しない場合でも、存在出来るように設定完了
   * Document 内の NodeSet#[] の結果をキャッシュする
@@ -795,7 +799,7 @@
 
 * 5つのバグ修正
 
-  * NodeSet が to_ary へ実行
+  * NodeSet が to_ary を実装
   * XML::Document#parent を除去
   * GCバグ修正済み (Mike は最高！)
   * 1.8.5互換性の為の RARRAY_LEN 除去
@@ -806,7 +810,7 @@
 
 * 1つのバグ修正
 
-  * extconf.rb は frex や racc を調べないはず
+  * extconf.rb は frex や racc の存在をチェックすべきでない
 
 
 === 1.0.1

data/CHANGELOG.rdoc

@@ -1,10 +1,9 @@
-=== 1.6.1 / unreleased
+=== 1.6.1 / 2013-12-14
 
-* Features
+* Bugfixes
 
-  * Nokogiri now builds libxml2 properly with iconv support on platforms
-    where libiconv is installed outside the system default directories,
-    such as FreeBSD.
+  * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
+  * (JRuby) Fix regression of billion-laughs vulnerability. #586
 
 
 === 1.6.0 / 2013-06-08
@@ -43,12 +42,20 @@ mentioned in the notes for v1.5.10.
   * Support for Ruby 1.8.7 and prior has been dropped
 
 
+=== 1.5.11 / 2013-11-09
+
+* Bugfixes
+
+  * (JRuby) Fix out of memory bug when certain invalid documents are parsed.
+  * (JRuby) Fix regression of billion-laughs vulnerability. #568
+
+
 === 1.5.10 / 2013-06-07
 
 * Bugfixes
 
   * (JRuby) Fix "null document" error when parsing an empty IO in jruby 1.7.3. #883
-  * (JRuby) Fix schema validation when XSD has DOCTYPE set to DTD. #912 (Thanks, Patrick Cheng!)
+  * (JRuby) Fix schema validation when XSD has DOCTYPE set to DTD. #861 (Thanks, Patrick Cheng!)
   * (MRI) Fix segfault when there is no default subelement for an HTML node. #917
 
 

data/Gemfile

@@ -16,6 +16,6 @@ gem "rake-compiler", "~>0.8.0", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
 gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "hoe", "~>2.16", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Rakefile

@@ -32,6 +32,8 @@ HOE = Hoe.spec 'nokogiri' do
 
   self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
 
+  self.licenses = ['MIT']
+
   self.clean_globs += [
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
@@ -240,7 +242,7 @@ task "gem:windows" => "gem" do
   raise "rbconfig #{rbconfig_20} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_20).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
   pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
-  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross2 native gem") || raise("build failed!")
+  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
 end
 
 # vim: syntax=Ruby

data/build_all

@@ -53,7 +53,7 @@ function rvm_use {
 set -o errexit
 
 # initialize
-rvm_use 1.9.3
+rvm_use 1.8.7
 bundle install --quiet --local || bundle install
 rm -rf tmp pkg
 bundle exec rake clean
@@ -70,7 +70,15 @@ if [[ $platform =~ "64" ]] ; then
     echo ""
     exit 1
 fi
-rvm_use 1.9.3
+rvm_use 1.8.7
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p358/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
+
+    # if this fails around the purelib.rb thing, try varying the ruby
+    # used to run this script, and whether the HOST env var is set
+    # below.
+
+    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p358 # HOST=i386-mingw32
+fi
 if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
     bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
 fi
@@ -82,7 +90,7 @@ bundle exec rake gem:windows
 cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
 
 # MRI
-rvm_use 1.9.3
+rvm_use 1.8.7
 bundle exec rake gem
 cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
 
@@ -90,7 +98,7 @@ cp -v pkg/nokogiri*.gem gems # should only be one at this point in the script
 rvm_use jruby
 bundle install --quiet --local || bundle install
 bundle exec rake clean clobber
-rvm_use 1.9.3
+rvm_use 1.8.7
 bundle exec rake generate
 rvm_use jruby
 bundle exec rake gem

data/ext/nokogiri/extconf.rb

@@ -18,31 +18,6 @@ end
 $CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
-def preserving_globals
-  values =
-    $arg_config,
-    $CFLAGS, $CPPFLAGS,
-    $LDFLAGS, $LIBPATH, $libs
-  yield
-ensure
-  $arg_config,
-  $CFLAGS, $CPPFLAGS,
-  $LDFLAGS, $LIBPATH, $libs =
-    values
-end
-
-def asplode(lib)
-  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
-end
-
-def have_iconv?
-  have_header('iconv.h') or return false
-  %w{ iconv_open libiconv_open }.any? do |method|
-    have_func(method, 'iconv.h') or
-      have_library('iconv', method, 'iconv.h')
-  end
-end
-
 windows_p = RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
 
 if windows_p
@@ -70,20 +45,18 @@ if windows_p
   XML2_HEADER_DIRS = [File.join(INCLUDEDIR, "libxml2"), INCLUDEDIR]
 
 else
-  opt_header_dirs = [
-    # First search /opt/local for macports
-    '/opt/local/include',
+  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
+    HEADER_DIRS = [
+      # First search /opt/local for macports
+      '/opt/local/include',
 
-    # Then search /usr/local for people that installed from source
-    '/usr/local/include',
+      # Then search /usr/local for people that installed from source
+      '/usr/local/include',
 
-    # Check the ruby install locations
-    INCLUDEDIR,
-  ]
+      # Check the ruby install locations
+      INCLUDEDIR,
 
-  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
-    HEADER_DIRS = opt_header_dirs + [
-      # Fall back to /usr
+      # Finally fall back to /usr
       '/usr/include',
       '/usr/include/libxml2',
     ]
@@ -102,9 +75,11 @@ else
       '/usr/lib',
     ]
 
-    XML2_HEADER_DIRS = opt_header_dirs.map { |idir|
-      File.join(idir, "libxml2")
-    } + HEADER_DIRS
+    XML2_HEADER_DIRS = [
+      '/opt/local/include/libxml2',
+      '/usr/local/include/libxml2',
+      File.join(INCLUDEDIR, "libxml2")
+    ] + HEADER_DIRS
 
     # If the user has homebrew installed, use the libxml2 inside homebrew
     brew_prefix = `brew --prefix libxml2 2> /dev/null`.chomp
@@ -129,50 +104,6 @@ else
       recipe.activate
     end
 
-    def each_idir
-      # If --with-iconv-dir is given, it should be the first priority
-      idir = preserving_globals {
-        dir_config('iconv')
-      }.first and yield idirta
-
-      # Then --with-opt-dir
-      idir = preserving_globals {
-        dir_config('opt')
-      }.first and yield idir
-
-      # Try the system default
-      yield "/usr/include"
-
-      opt_header_dirs.each { |dir|
-        yield dir
-      }
-
-      cflags, = preserving_globals {
-        pkg_config('libiconv')
-      }
-      if cflags
-        cflags.shellsplit.each { |arg|
-          arg.sub!(/\A-I/, '') and
-          yield arg
-        }
-      end
-
-      nil
-    end
-
-    # Make sure libxml2 is built with iconv
-    iconv_prefix = each_idir { |idir|
-      prefix = %r{\A(.+)?/include\z} === idir && $1 or next
-      File.exist?(File.join(idir, 'iconv.h')) or next
-      preserving_globals {
-        # Follow the way libxml2's configure uses a value given with
-        # --with-iconv[=DIR]
-        $CPPFLAGS << " -I#{idir}"
-        $LDFLAGS  << " -L#{prefix}/lib"
-        have_iconv?
-      } and break prefix
-    } or asplode "libiconv"
-
     dependencies = YAML.load_file(File.join(ROOT, "dependencies.yml"))
 
     libxml2_recipe = MiniPortile.new("libxml2", dependencies["libxml2"]).tap do |recipe|
@@ -181,7 +112,6 @@ else
         "--disable-static",
         "--without-python",
         "--without-readline",
-        "--with-iconv=#{iconv_prefix}",
         "--with-c14n",
         "--with-debug",
         "--with-threads"
@@ -217,10 +147,22 @@ dir_config('iconv', HEADER_DIRS, LIB_DIRS)
 dir_config('xml2', XML2_HEADER_DIRS, LIB_DIRS)
 dir_config('xslt', HEADER_DIRS, LIB_DIRS)
 
+def asplode(lib)
+  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
+end
+
 pkg_config('libxslt')
 pkg_config('libxml-2.0')
 pkg_config('libiconv')
 
+def have_iconv?
+  %w{ iconv_open libiconv_open }.any? do |method|
+    have_func(method, 'iconv.h') or
+      have_library('iconv', method, 'iconv.h') or
+      find_library('iconv', method, 'iconv.h')
+  end
+end
+
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')
 asplode "libexslt" unless find_header('libexslt/exslt.h')

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 
   class VersionInfo # :nodoc:
     def jruby?
@@ -12,7 +12,7 @@ module Nokogiri
     end
 
     def loaded_parser_version
-      LIBXML_PARSER_VERSION.scan(/^(.*)(..)(..)$/).first.collect{ |j|
+      LIBXML_PARSER_VERSION.scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.collect{ |j|
         j.to_i
       }.join(".")
     end

data/tasks/cross_compile.rb

@@ -2,6 +2,8 @@ gem 'rake-compiler'
 require 'rake/extensioncompiler'
 HOST = Rake::ExtensionCompiler.mingw_host
 
+require 'resolv'
+
 require 'mini_portile'
 dependencies = YAML.load_file("dependencies.yml")
 $recipes = {}
@@ -121,12 +123,12 @@ namespace :cross do
   end
 
   task :file_list do
-    add_file_to_gem "lib/nokogiri/nokogiri.rb"
+    HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
+    HOE.spec.files += Dir["lib/nokogiri/{1.9,2.0}/nokogiri.so"]
   end
-
 end
 
 require 'rake/clean'
 CLOBBER.include("#{CROSS_DIR}/*.installed", "#{CROSS_DIR}/#{HOST}", "tmp/#{HOST}")
 
-task :cross2 => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross", "cross:file_list"]
+task :cross => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross:file_list"]

data/test/test_reader.rb

@@ -45,17 +45,14 @@ class TestReader < Nokogiri::TestCase
         node_out = node
         break
       end
-      rd.close
     end
     sleep(1)              # sleep for one second to make sure the reader will actually block for input
-    begin
-      wr.puts "<foo>"
-      wr.puts "<bar/>" * 10000
-      wr.flush
-    rescue Errno::EPIPE
-    end
+    wr.puts "<foo>"
+    wr.puts "<bar/>" * 10000
+    wr.flush
     res = t.join(5)    # wait 5 seconds for the thread to finish
     wr.close
+    rd.close
     refute_nil node_out, "Didn't read any nodes, exclude the trivial case"
     refute_nil res, "Reader blocks trying to read the entire stream"
   end

data/test/xml/test_document.rb

@@ -60,6 +60,40 @@ module Nokogiri
         assert_equal nil, @xml.root
       end
 
+      def test_million_laugh_attach
+        doc = Nokogiri::XML '<?xml version="1.0"?>
+<!DOCTYPE lolz [
+<!ENTITY lol "lol">
+<!ENTITY lol2 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
+<!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
+<!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
+<!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;">
+<!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;">
+<!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;">
+<!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;">
+<!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">
+]>
+<lolz>&lol9;</lolz>'
+        assert_not_nil doc
+      end
+
+      def test_million_laugh_attach_2
+        doc = Nokogiri::XML '<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE member [
+   <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
+   <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
+   <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
+   <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
+   <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
+   <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
+   <!ENTITY g "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx">
+ ]>
+ <member>
+ &a;
+ </member>'
+        assert_not_nil doc
+      end
+
       def test_ignore_unknown_namespace
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
@@ -519,6 +553,12 @@ module Nokogiri
         end
       end
 
+      def test_memory_explosion_on_invalid_xml
+        doc = Nokogiri::XML("<<<")
+        refute_nil doc
+        refute_empty doc.errors
+      end
+
       def test_document_has_errors
         doc = Nokogiri::XML(<<-eoxml)
           <foo><bar></foo>

metadata

@@ -1,10 +1,9 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: nokogiri
-version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 1.6.1
 platform: x86-mswin32-60
-authors:
+authors: 
 - Aaron Patterson
 - Mike Dalessio
 - Yoko Harada
@@ -12,223 +11,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mini_portile
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+
+date: 2013-12-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :runtime
+  name: mini_portile
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        version: "4.0"
   type: :development
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: hoe-debugging
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.1"
   type: :development
+  name: hoe-bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: hoe-gemspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :development
+  name: hoe-debugging
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: hoe-git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.4'
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
   type: :development
+  name: hoe-gemspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :development
+  name: hoe-git
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
   type: :development
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
   type: :development
+  name: rake-compiler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: rexical
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.5
   type: :development
+  name: racc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
   type: :development
+  name: rexical
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.16'
+      - !ruby/object:Gem::Version 
+        version: "3.7"
   type: :development
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.16'
-description: ! 'Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri''s
-
-  many features is the ability to search documents via XPath or CSS3 selectors.
-
-
-  XML is like violence - if it doesn’t solve your problems, you are not using
-
-  enough of it.'
-email:
+  requirement: *id012
+description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
+  many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
+  XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
+  enough of it."
+email: 
 - aaronp@rubyforge.org
 - mike.dalessio@gmail.com
 - yokolet@gmail.com
 - tle@holymonkey.com
-executables:
+executables: 
 - nokogiri
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
 - C_CODING_STYLE.rdoc
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- ROADMAP.md
+- STANDARD_RESPONSES.md
+- Y_U_NO_GEMSPEC.md
 - ext/nokogiri/html_document.c
 - ext/nokogiri/html_element_description.c
 - ext/nokogiri/html_entity_lookup.c
@@ -263,7 +191,7 @@ extra_rdoc_files:
 - ext/nokogiri/xml_text.c
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xslt_stylesheet.c
-files:
+files: 
 - .autotest
 - .gemtest
 - .travis.yml
@@ -519,32 +447,34 @@ files:
 - lib/nokogiri/1.9/nokogiri.so
 - lib/nokogiri/2.0/nokogiri.so
 homepage: http://nokogiri.org
-licenses: []
+licenses: 
+- MIT
+metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: nokogiri
-rubygems_version: 1.8.25
+rubygems_version: 2.0.13
 signing_key: 
-specification_version: 3
-summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser
-test_files:
+specification_version: 4
+summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
+test_files: 
 - test/decorators/test_slop.rb
 - test/test_encoding_handler.rb
 - test/css/test_parser.rb