nokogiri 1.11.4 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a118942143d2327ae26b7b744c2b8943a8ece19ebe3315d21cc7c4be4cf9c40a
-  data.tar.gz: 4c51403f795de70dbc5632da785e7b73ae1ee778f6e4d6cd6bd9d73c34203b3a
+  metadata.gz: 0cd8509ca6a1609635cf79076efa4d0ccc203d69e8a9ce68f7b4648e5a30c8b4
+  data.tar.gz: 171144f295bac5337867370b0b2ade023a697f08c089580d681dd4c9316494da
 SHA512:
-  metadata.gz: 8dabfef7045e1994279ec25815da136b293c7d8b1938f906c329f1ee37a275dddad49e3b8b2b1d98f0c858503f43912f2c1ece7228675a4e05220b3efa9f58b6
-  data.tar.gz: 63741c77111a156e0fe25fded997205cffcf6e94e3404f347edcb758ef6848fd332567528975e5e1ded490e4269d7b87cd92d53f3a2983863925d4af738b7637
+  metadata.gz: 40876ba4cda6e2191f4380340b4b35d1ac30906818c5a1fcddc7bda1aef767d31deef38683d19dc76560c55627103f481aedeb0b78ef083c7b51e64de0556dbd
+  data.tar.gz: 6739c13cbe2a3bab87bc02af7ff8209a60a6ddb30c05cce7a844cd4272937285f6617fb8cfe4def6e4e3fa1bd267b41672507bd682fdc050d6d69f512032458d

data/ext/nokogiri/nokogiri.c

@@ -191,7 +191,26 @@ Init_nokogiri()
   rb_const_set(mNokogiri, rb_intern("OTHER_LIBRARY_VERSIONS"), NOKOGIRI_STR_NEW2(NOKOGIRI_OTHER_LIBRARY_VERSIONS));
 #endif
 
+#if defined(_WIN32) && !defined(NOKOGIRI_PACKAGED_LIBRARIES)
+  /*
+   *  We choose *not* to do use Ruby's memory management functions with windows DLLs because of this
+   *  issue in libxml 2.9.12:
+   *
+   *    https://github.com/sparklemotion/nokogiri/issues/2241
+   *
+   *  If the atexit() issue gets fixed in a future version of libxml2, then we may be able to skip
+   *  this config only for the specific libxml2 versions 2.9.12.
+   *
+   *  Alternatively, now that Ruby has a generational GC, it might be OK to let libxml2 use its
+   *  default memory management functions (recall that this config was introduced to reduce memory
+   *  bloat and allow Ruby to GC more often); but we should *really* test with production workloads
+   *  before making that kind of a potentially-invasive change.
+   */
+  rb_const_set(mNokogiri, rb_intern("LIBXML_MEMORY_MANAGEMENT"), NOKOGIRI_STR_NEW2("default"));
+#else
+  rb_const_set(mNokogiri, rb_intern("LIBXML_MEMORY_MANAGEMENT"), NOKOGIRI_STR_NEW2("ruby"));
   xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+#endif
 
   xmlInitParser();
 

data/ext/nokogiri/xml_node.c

@@ -1292,17 +1292,25 @@ get_name(VALUE self)
  * Returns the path associated with this Node
  */
 static VALUE
-path(VALUE self)
+noko_xml_node_path(VALUE rb_node)
 {
-  xmlNodePtr node;
-  xmlChar *path ;
+  xmlNodePtr c_node;
+  xmlChar *c_path ;
   VALUE rval;
 
-  Data_Get_Struct(self, xmlNode, node);
+  Data_Get_Struct(rb_node, xmlNode, c_node);
+
+  c_path = xmlGetNodePath(c_node);
+  if (c_path == NULL) {
+    // see https://github.com/sparklemotion/nokogiri/issues/2250
+    // this behavior is clearly undesirable, but is what libxml <= 2.9.10 returned, and so we
+    // do this for now to preserve the behavior across libxml2 versions.
+    rval = NOKOGIRI_STR_NEW2("?");
+  } else {
+    rval = NOKOGIRI_STR_NEW2(c_path);
+    xmlFree(c_path);
+  }
 
-  path = xmlGetNodePath(node);
-  rval = NOKOGIRI_STR_NEW2(path);
-  xmlFree(path);
   return rval ;
 }
 
@@ -1779,7 +1787,7 @@ noko_init_xml_node()
   rb_define_method(cNokogiriXmlNode, "next_element", next_element, 0);
   rb_define_method(cNokogiriXmlNode, "previous_element", previous_element, 0);
   rb_define_method(cNokogiriXmlNode, "node_type", node_type, 0);
-  rb_define_method(cNokogiriXmlNode, "path", path, 0);
+  rb_define_method(cNokogiriXmlNode, "path", noko_xml_node_path, 0);
   rb_define_method(cNokogiriXmlNode, "key?", key_eh, 1);
   rb_define_method(cNokogiriXmlNode, "namespaced_key?", namespaced_key_eh, 2);
   rb_define_method(cNokogiriXmlNode, "blank?", blank_eh, 0);

data/lib/nokogiri/version/constant.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.11.4"
+  VERSION = "1.11.6"
 end

data/lib/nokogiri/version/info.rb

@@ -137,6 +137,7 @@ module Nokogiri
             else
               libxml["source"] = "system"
             end
+            libxml["memory_management"] = Nokogiri::LIBXML_MEMORY_MANAGEMENT
             libxml["iconv_enabled"] = libxml2_has_iconv?
             libxml["compiled"] = compiled_libxml_version.to_s
             libxml["loaded"] = loaded_libxml_version.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.11.6
 platform: ruby
 authors:
 - Mike Dalessio
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc