nokogiri 1.8.2-java → 1.8.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 23422f6678062a871c836fd2b844d8b286a682eb4b261285e969c9a7d44fa555
-  data.tar.gz: 7f5a130b02e476899204ae9f04d7761de8c24ea9d8b9b4f3fb044e09229de67e
+SHA1:
+  metadata.gz: f6f9a9fae7034c2bd0c490e0395e5c7a26dbde6c
+  data.tar.gz: f97501387a99a0a335c45569eaa22bdc9b6f41af
 SHA512:
-  metadata.gz: 067c096637dcee08715b39429bd362c020cc00bce7e7a4f24eedcea4935f7e91e6abdfb545463963e29853acd5d7c56f4df1062d5463e8952b9fe4892b9d42ec
-  data.tar.gz: 72dcc24e197b347240b9c88d694151eee14f9480505e889d585407e91a20a4c3128a9a0d948a277246149153bb2d219bbd12cbf89a8f9c04e50000d8f38476da
+  metadata.gz: 6f248fb6871692986843da22c22c7f20064e1ed1d92c073fbe5b00f7a2151d5f409f1723dbc2ec356fe80e192bf975bc6f9033d056916b1f0f661085e88a0da0
+  data.tar.gz: 94306c4713312f3c00da66f82adc79dc159eb6b40ffedf11ac5185efacfab1fcf4bac083c1d0fff95947612f4c97a0f8e7d8b6e6d5656d25d24c8913df279b34

data/.travis.yml

@@ -18,15 +18,15 @@ matrix:
   - os: osx
     rvm: 2.2.5
   - os: linux
-    rvm: 2.3.1
+    rvm: 2.3.5
   - os: osx
-    rvm: 2.3.1
+    rvm: 2.3.5
   - os: linux
-    rvm: 2.4.0
+    rvm: 2.4.2
     env:
       - RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
   - os: osx
-    rvm: 2.4.0
+    rvm: 2.4.2
     env:
       - RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
   - os: linux
@@ -40,22 +40,22 @@ matrix:
   - os: linux
     rvm: jruby-1.7
   - os: linux
-    rvm: jruby-9.1.5.0
+    rvm: jruby-9.1.15.0
   - os: linux
     rvm: rbx-3
   allow_failures:
   - rvm: ruby-head
   fast_finish: true
 
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#nokogiri"
-    on_success: always
-    on_failure: always
-    template:
-      - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
-    skip_join: true
+# notifications:
+#   irc:
+#     channels:
+#       - "chat.freenode.net#nokogiri"
+#     on_success: always
+#     on_failure: always
+#     template:
+#       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
+#     skip_join: true
 
 addons:
   apt:

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+# 1.8.3 / 2018-06-16
+
+## Security Notes
+
+[MRI] Behavior in libxml2 has been reverted which caused CVE-2018-8048 (loofah gem), CVE-2018-3740 (sanitize gem), and CVE-2018-3741 (rails-html-sanitizer gem). The commit in question is here:
+
+> https://github.com/GNOME/libxml2/commit/960f0e2
+
+and more information is available about this commit and its impact here:
+
+> https://github.com/flavorjones/loofah/issues/144
+
+This release simply reverts the libxml2 commit in question to protect users of Nokogiri's vendored libraries from similar vulnerabilities.
+
+If you're offended by what happened here, I'd kindly ask that you comment on the upstream bug report here:
+
+> https://bugzilla.gnome.org/show_bug.cgi?id=769760
+
+
+## Dependencies
+
+* [MRI] libxml2 is updated from 2.9.7 to 2.9.8
+
+
+## Features
+
+* Node#classes, #add_class, #append_class, and #remove_class are added.
+* NodeSet#append_class is added.
+* NodeSet#remove_attribute is a new alias for NodeSet#remove_attr.
+* NodeSet#each now returns an Enumerator when no block is passed (Thanks, @park53kr!)
+* [JRuby] General improvements in JRuby implementation (Thanks, @kares!)
+
+
+## Bug fixes
+
+* CSS attribute selectors now gracefully handle queries using integers. [#711]
+* Handle ASCII-8BIT encoding on fragment input [#553]
+* Handle non-string return values within `Reader` [#898]
+* [JRuby] Allow Node#replace to insert Comment and CDATA nodes. [#1666]
+* [JRuby] Stability and speed improvements to `Node`, `Sax::PushParser`, and the JRuby implementation [#1708, #1710, #1501]
+
+
 # 1.8.2 / 2018-01-29
 
 ## Security Notes
@@ -8,7 +50,7 @@
 ## Dependencies
 
 * [MRI] libxml2 is updated from 2.9.5 to 2.9.7
-* [MRI] libxml2 is updated from 1.1.30 to 1.1.32
+* [MRI] libxslt is updated from 1.1.30 to 1.1.32
 
 
 ## Features

data/LICENSE.md

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2008 - 2017:
+Copyright (c) 2008 - 2018:
 
 * [Aaron Patterson](http://tenderlovemaking.com)
 * [Mike Dalessio](http://mike.daless.io)
@@ -10,6 +10,7 @@ Copyright (c) 2008 - 2017:
 * [Yoko Harada](http://yokolet.blogspot.com)
 * [Akinori MUSHA](https://akinori.org)
 * [John Shahid](https://github.com/jvshahid)
+* [Lars Kanis](https://github.com/larskanis)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -14,6 +14,7 @@ Manifest.txt
 README.md
 ROADMAP.md
 Rakefile
+SECURITY.md
 STANDARD_RESPONSES.md
 Y_U_NO_GEMSPEC.md
 appveyor.yml
@@ -249,6 +250,7 @@ lib/xalan.jar
 lib/xercesImpl.jar
 lib/xml-apis.jar
 lib/xsd/xmlparser/nokogiri.rb
+patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch
 patches/sort-patches-by-date
 suppressions/README.txt
 suppressions/nokogiri_ruby-2.supp
@@ -300,6 +302,7 @@ test/html/sax/test_parser.rb
 test/html/sax/test_parser_context.rb
 test/html/sax/test_parser_text.rb
 test/html/sax/test_push_parser.rb
+test/html/test_attributes.rb
 test/html/test_builder.rb
 test/html/test_document.rb
 test/html/test_document_encoding.rb

data/README.md

@@ -1,30 +1,24 @@
 # Nokogiri
 
-* http://nokogiri.org
-* Installation: http://nokogiri.org/tutorials/installing_nokogiri.html
-* Tutorials:    http://nokogiri.org
-* README:       https://github.com/sparklemotion/nokogiri
-* Mailing List: https://groups.google.com/group/nokogiri-talk
-* Bug Reports:  https://github.com/sparklemotion/nokogiri/issues
-
-
-## Status
-
-|System|Status|
-|--|--|
-| Concourse | [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master) |
-| Travis | [![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri) |
-| Appveyor | [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master) |
-| Code Climate | [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri) |
-| Version Eye | [![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri) |
-
-
 ## 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.
 
+* http://nokogiri.org
+* [Installation Help](http://nokogiri.org/tutorials/installing_nokogiri.html)
+* [Tutorials](http://nokogiri.org)
+* [GitHub](https://github.com/sparklemotion/nokogiri)
+* [Mailing List](https://groups.google.com/group/nokogiri-talk)
+* [Bug Reports](https://github.com/sparklemotion/nokogiri/issues)
+* [Chat/Gitter](https://gitter.im/sparklemotion/nokogiri)
+
+[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master)
+[![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
+[![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
+[![Join the chat at https://gitter.im/sparklemotion/nokogiri](https://badges.gitter.im/sparklemotion/nokogiri.svg)](https://gitter.im/sparklemotion/nokogiri?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 
 ## Features
 
@@ -81,6 +75,11 @@ There are open-source tutorials (to which we invite contributions!) here: http:/
 * The IRC channel is #nokogiri on freenode.
 
 
+## Security and Vulnerability Reporting
+
+See [`SECURITY.md`](SECURITY.md)
+
+
 ## Synopsis
 
 Nokogiri is a large library, but here is example usage for parsing and examining a document:
@@ -158,7 +157,7 @@ best bet is to explicitly set the encoding.  Here is an example of
 explicitly setting the encoding to EUC-JP on the parser:
 
 ```ruby
-  doc = Nokogiri.XML('<foo><bar /><foo>', nil, 'EUC-JP')
+  doc = Nokogiri.XML('<foo><bar /></foo>', nil, 'EUC-JP')
 ```
 
 ## Development
@@ -170,4 +169,4 @@ explicitly setting the encoding to EUC-JP on the parser:
 
 ## License
 
-MIT. See the `LICENSE.md` file.
+MIT. See [`LICENSE.md`](LICENSE.md).

data/Rakefile

@@ -107,6 +107,8 @@ HOE = Hoe.spec 'nokogiri' do
   developer 'Yoko Harada',     'yokolet@gmail.com'
   developer 'Tim Elliott',     'tle@holymonkey.com'
   developer 'Akinori MUSHA',   'knu@idaemons.org'
+  developer 'John Shahid',     'jvshahid@gmail.com'
+  developer 'Lars Kanis',      'lars@greiz-reinsdorf.de'
 
   license "MIT"
 
@@ -292,15 +294,7 @@ task :java_debug do
   ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if ENV['JAVA_DEBUG']
 end
 
-if java?
-  task :test_19 => :test
-  task :test_20 do
-    ENV['JRUBY_OPTS'] = "--2.0"
-    Rake::Task["test"].invoke
-  end
-end
-
-# Rake::Task[:test].prerequisites << :compile
+Rake::Task[:test].prerequisites << :compile
 Rake::Task[:test].prerequisites << :java_debug
 Rake::Task[:test].prerequisites << :check_extra_deps unless java?
 

data/SECURITY.md

@@ -0,0 +1,19 @@
+# Security and Vulnerability Reporting
+
+The Nokogiri Core Contributors take security very seriously and investigate all reported vulnerabilities.
+
+If you would like to report a vulnerablity or have a security concern regarding Nokogiri or how Nokogiri is using any of its underlying platform-specific libraries (such as libxml2 or xerces), please [report it via HackerOne](https://hackerone.com/nokogiri/reports/new).
+
+Your report will be acknowledged within 24 hours, and you'll receive a more detailed response within 72 hours indicating next steps in handling your report.
+
+If you have not received a reply to your submission within 48 hours, there are a few steps you can take:
+
+* Contact the current security coordinator (Mike Dalessio <mike.dalessio@gmail.com>)
+* Contact the core contributor mailing list (nokogiri-core@googlegroups.com)
+* Join the [nokogiri-talk group](https://groups.google.com/d/forum/nokogiri-talk)
+
+Please note, the nokogiri-talk list is a public area. When escalating in that venue, please do not discuss your issue. Simply say that you're trying to get a hold of someone from the core team.
+
+The information you share with the Nokogiri Core Contributors as part of this process will be kept confidential within the team, unless or until we need to share information upstream with our dependent libraries' core teams, at which point we will notify you.
+
+If a vulnerability is first reported by you, we will credit you with the discovery in the public disclosure.

data/build_all

@@ -40,5 +40,5 @@ bundle exec rake generate
 rvm jruby
 gem install bundler --conservative
 bundle install --quiet --local || bundle install
-bundle exec rake gem
+bundle exec ruby -S rake gem
 cp -v pkg/nokogiri*java.gem gems

data/dependencies.yml

@@ -1,10 +1,10 @@
 libxml2:
-  version: "2.9.7"
-  sha256: "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"
+  version: "2.9.8"
+  sha256: "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"
   # manually verified checksum:
   #
-  #   $ gpg --verify libxml2-2.9.7.tar.gz.asc libxml2-2.9.7.tar.gz
-  #   gpg: Signature made Thu 02 Nov 2017 04:17:54 PM EDT using RSA key ID 596BEA5D
+  #   $ gpg --verify libxml2-2.9.8.tar.gz.asc ./ports/archives/libxml2-2.9.8.tar.gz
+  #   gpg: Signature made Mon 05 Mar 2018 11:07:45 AM EST using RSA key ID 596BEA5D
   #   gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   #   gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
   #   gpg: WARNING: This key is not certified with a trusted signature!
@@ -15,13 +15,13 @@ libxml2:
   # using this pgp signature:
   #   -----BEGIN PGP SIGNATURE-----
   #
-  #   iQEcBAABAgAGBQJZ+31yAAoJEBVYiyZZa+pd+MMH/RTsPCo8CegAHsSUlNCae2Ay
-  #   HpM6J7sNWs0b2xwaYRtwhewJ5z/rsCcM5nn7MeGiU8dX7W5MKF69uGXUywufRxzO
-  #   GFoQSxO0a1z5mtGu7jC/W6DTYHFBeOJcEfMa3zUZjZ0RXqrENRhX55okse4pJPmG
-  #   dWQphbu9G3qoCuWD7QpyI7Mjhjemmyi4Ai/4vJPO8WtB7VDfdtpuZFVCRLG2cp0X
-  #   90SZde+0oWJcN8oIG3FaTd7O4OuJPAceqNhTvF90dLvqSqRBd0RqZNnjYNYZ6uRy
-  #   FQSlQBVCxdLY0AI7Yooq79TJD+0vcqiQNwQwH7L+hBWgvPos4DKN1M9LaJc/RTk=
-  #   =5Qzo
+  #   iQEcBAABAgAGBQJanWtRAAoJEBVYiyZZa+pdV7oIAJWdFahwt+reN/Zt2RPmjjcr
+  #   eSsY7UV1RXjScnNjTzJT1h2hJ7SnUjCkqjR6VdtKDUIzpuX+S2U83joafJH6mxUb
+  #   yw2nO4RfjYTPxpz5JkvqT7jmgEIaD81BuwcMehqpMpIfiKa2NgO1DSfZxgs8a9E2
+  #   +ehc/kZWuI5gmNGrd84EEWUqpYW/Xx7jy02osioJuU5IMPjzZKNR3maXp9oAKeBc
+  #   S2QNa1ID/pUk3K3M/5nlwNgAtQ7lxQrqhrSma2dsKt/IpL6VXomxuD4Bh1r2MZhX
+  #   uZ456X/xJN8UmPewLZWGBU1MK9wqu3Zx5Qwz64H6UdlYIzXZ2jXj2YWZa6xkxPA=
+  #   =69xn
   #   -----END PGP SIGNATURE-----
   #
 

data/ext/java/nokogiri/HtmlSaxParserContext.java

@@ -223,30 +223,24 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
     }
 
     /**
-     * Create a new parser context that will read from a raw input
-     * stream. Not a JRuby method.  Meant to be run in a separate
-     * thread by HtmlSaxPushParser.
+     * Create a new parser context that will read from a raw input stream.
+     * Meant to be run in a separate thread by HtmlSaxPushParser.
      */
-    public static IRubyObject parse_stream(ThreadContext context,
-                                           IRubyObject klazz,
-                                           InputStream stream) {
-        HtmlSaxParserContext ctx = (HtmlSaxParserContext) NokogiriService.HTML_SAXPARSER_CONTEXT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass)klazz);
-        ctx.initialize(context.getRuntime());
+    static HtmlSaxParserContext parse_stream(final Ruby runtime, RubyClass klazz, InputStream stream) {
+        HtmlSaxParserContext ctx = (HtmlSaxParserContext) NokogiriService.HTML_SAXPARSER_CONTEXT_ALLOCATOR.allocate(runtime, klazz);
+        ctx.initialize(runtime);
         ctx.setInputSource(stream);
         return ctx;
     }
 
     @Override
-    protected void preParse(ThreadContext context,
-                             IRubyObject handlerRuby,
-                             NokogiriHandler handler) {
+    protected void preParse(final Ruby runtime, IRubyObject handlerRuby, NokogiriHandler handler) {
         // final String path = "Nokogiri::XML::FragmentHandler";
         // final String docFrag =
         //     "http://cyberneko.org/html/features/balance-tags/document-fragment";
         // RubyObjectAdapter adapter = JavaEmbedUtils.newObjectAdapter();
         // IRubyObject doc = adapter.getInstanceVariable(handlerRuby, "@document");
-        // RubyModule mod =
-        //     context.getRuntime().getClassFromPath(path);
+        // RubyModule mod = runtime.getClassFromPath(path);
         // try {
         //     if (doc != null && !doc.isNil() && adapter.isKindOf(doc, mod))
         //         parser.setFeature(docFrag, true);

data/ext/java/nokogiri/HtmlSaxPushParser.java

@@ -32,33 +32,26 @@
 
 package nokogiri;
 
+import static nokogiri.XmlSaxPushParser.terminateExecution;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
-import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.EnumSet;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.ThreadFactory;
 
-import nokogiri.internals.ClosedStreamException;
-import nokogiri.internals.NokogiriBlockingQueueInputStream;
-import nokogiri.internals.NokogiriHelpers;
-import nokogiri.internals.ParserContext;
+import nokogiri.internals.*;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.RubyException;
-import org.jruby.RubyFixnum;
 import org.jruby.RubyObject;
-import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
@@ -74,12 +67,13 @@ import org.jruby.runtime.builtin.IRubyObject;
 @JRubyClass(name="Nokogiri::HTML::SAX::PushParser")
 public class HtmlSaxPushParser extends RubyObject {
     ParserContext.Options options;
-    IRubyObject optionsRuby;
     IRubyObject saxParser;
+
     NokogiriBlockingQueueInputStream stream;
-    ParserTask parserTask = null;
-    FutureTask<HtmlSaxParserContext> futureTask = null;
-    ExecutorService executor = null;
+
+    private ParserTask parserTask = null;
+    private FutureTask<HtmlSaxParserContext> futureTask = null;
+    private ExecutorService executor = null;
 
     public HtmlSaxPushParser(Ruby ruby, RubyClass rubyClass) {
         super(ruby, rubyClass);
@@ -87,48 +81,46 @@ public class HtmlSaxPushParser extends RubyObject {
 
     @Override
     public void finalize() {
-      terminateTask(null);
+        try {
+            terminateImpl();
+        }
+        catch (Exception e) { /* ignored */ }
     }
 
-    /**
-    * Silently skips provided encoding
-    *
-    */
     @JRubyMethod
     public IRubyObject initialize_native(final ThreadContext context,
                                          IRubyObject saxParser,
                                          IRubyObject fileName,
                                          IRubyObject encoding) {
-        optionsRuby
-            = invoke(context, context.getRuntime().getClassFromPath("Nokogiri::XML::ParseOptions"), "new");
-       
+        // NOTE: Silently skips provided encoding
         options = new ParserContext.Options(0);
         this.saxParser = saxParser;
         return this;
     }
 
-    /**
-     * Returns an integer.
-     */
+    private transient IRubyObject parse_options;
+
+    private IRubyObject parse_options(final ThreadContext context) {
+        if (parse_options == null) {
+            parse_options = invoke(context, context.runtime.getClassFromPath("Nokogiri::XML::ParseOptions"), "new");
+        }
+        return parse_options;
+    }
+
     @JRubyMethod(name="options")
     public IRubyObject getOptions(ThreadContext context) {
-        return invoke(context, optionsRuby, "options");
+        return invoke(context, parse_options(context), "options");
     }
 
-    /**
-     * <code>val</code> is an integer.
-     */
     @JRubyMethod(name="options=")
-    public IRubyObject setOptions(ThreadContext context, IRubyObject val) {
-        invoke(context, optionsRuby, "options=", val);
-        options =
-            new ParserContext.Options(val.convertToInteger().getLongValue());
+    public IRubyObject setOptions(ThreadContext context, IRubyObject opts) {
+        invoke(context, parse_options(context), "options=", opts);
+        options = new ParserContext.Options(opts.convertToInteger().getLongValue());
         return getOptions(context);
     }
 
     @JRubyMethod
-    public IRubyObject native_write(ThreadContext context, IRubyObject chunk,
-                                    IRubyObject isLast) {
+    public IRubyObject native_write(ThreadContext context, IRubyObject chunk, IRubyObject isLast) {
         try {
             initialize_task(context);
         } catch (IOException e) {
@@ -136,7 +128,7 @@ public class HtmlSaxPushParser extends RubyObject {
         }
         final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
         if (data == null) {
-            terminateTask(context);
+            terminateTask(context.runtime);
             throw new RaiseException(XmlSyntaxError.createHTMLSyntaxError(context.runtime)); // Nokogiri::HTML::SyntaxError
         }
 
@@ -145,33 +137,37 @@ public class HtmlSaxPushParser extends RubyObject {
         if (isLast.isTrue()) {
             IRubyObject document = invoke(context, this, "document");
             invoke(context, document, "end_document");
-            terminateTask(context);
+            terminateTask(context.runtime);
         } else {
             try {
-              Future<Void> task = stream.addChunk(data);
-              task.get();
-            } catch (ClosedStreamException ex) {
-              // this means the stream is closed, ignore this exception
-            } catch (Exception e) {
-              throw context.getRuntime().newRuntimeError(e.getMessage());
+                Future<Void> task = stream.addChunk(data);
+                task.get();
+            }
+            catch (ClosedStreamException ex) {
+                // this means the stream is closed, ignore this exception
+            }
+            catch (Exception e) {
+                throw context.runtime.newRuntimeError(e.getMessage());
             }
 
         }
 
         if (!options.recover && parserTask.getErrorCount() > errorCount0) {
-            terminateTask(context);
-            throw new RaiseException(parserTask.getLastError(), true);
+            terminateTask(context.runtime);
+            throw parserTask.getLastError();
         }
 
         return this;
     }
 
+    @SuppressWarnings("unchecked")
     private void initialize_task(ThreadContext context) throws IOException {
         if (futureTask == null || stream == null) {
             stream = new NokogiriBlockingQueueInputStream();
 
-            parserTask = new ParserTask(context, saxParser);
-            futureTask = new FutureTask<HtmlSaxParserContext>(parserTask);
+            assert saxParser != null : "saxParser null";
+            parserTask = new ParserTask(context, saxParser, stream);
+            futureTask = new FutureTask<HtmlSaxParserContext>((Callable) parserTask);
             executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
               @Override
               public Thread newThread(Runnable r) {
@@ -185,56 +181,42 @@ public class HtmlSaxPushParser extends RubyObject {
         }
     }
 
-    private synchronized void terminateTask(ThreadContext context) {
+    private void terminateTask(final Ruby runtime) {
+        if (executor == null) return;
+
         try {
-          Future<Void> task = stream.addChunk(NokogiriBlockingQueueInputStream.END);
-          task.get();
-        } catch (ClosedStreamException ex) {
-          // ignore this exception, it means the stream was closed
-        } catch (Exception e) {
-            if (context != null)
-              throw context.getRuntime().newRuntimeError(e.getMessage());
+            terminateImpl();
+        }
+        catch (InterruptedException e) {
+            throw runtime.newRuntimeError(e.toString());
         }
-        futureTask.cancel(true);
-        executor.shutdown();
-        executor = null;
-        stream = null;
-        futureTask = null;
+        catch (Exception e) {
+            throw runtime.newRuntimeError(e.toString());
+        }
+    }
+
+    private synchronized void terminateImpl() throws InterruptedException, ExecutionException {
+        terminateExecution(executor, stream, futureTask);
+
+        executor = null; stream = null; futureTask = null;
+    }
+
+    private static HtmlSaxParserContext parse(final Ruby runtime, final InputStream stream) {
+        RubyClass klazz = getNokogiriClass(runtime, "Nokogiri::HTML::SAX::ParserContext");
+        return HtmlSaxParserContext.parse_stream(runtime, klazz, stream);
     }
-    
-
-    private class ParserTask implements Callable<HtmlSaxParserContext> {
-        private final ThreadContext context;
-        private final IRubyObject handler;
-        private final HtmlSaxParserContext parser;
-
-        private ParserTask(ThreadContext context, IRubyObject handler) {
-            RubyClass klazz = getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::SAX::ParserContext");
-            this.context = context;
-            this.handler = handler;
-            this.parser = (HtmlSaxParserContext) HtmlSaxParserContext.parse_stream(context, klazz, stream);
+
+    static class ParserTask extends XmlSaxPushParser.ParserTask /* <HtmlSaxPushParser> */ {
+
+        private ParserTask(ThreadContext context, IRubyObject handler, InputStream stream) {
+            super(context, handler, parse(context.runtime, stream), stream);
         }
 
         @Override
         public HtmlSaxParserContext call() throws Exception {
-          try {
-            parser.parse_with(context, handler);
-          } finally {
-            // we have to close the stream before exiting, otherwise someone
-            // can add a chunk and block on task.get() forever.
-            stream.close();
-          }
-          return parser;
-        }
-
-        private synchronized int getErrorCount() {
-            // check for null because thread may not have started yet
-            if (parser.getNokogiriHandler() == null) return 0;
-            else return parser.getNokogiriHandler().getErrorCount();
+            return (HtmlSaxParserContext) super.call();
         }
 
-        private synchronized RubyException getLastError() {
-            return (RubyException) parser.getNokogiriHandler().getLastError();
-        }
     }
+
 }