nokogiri 1.16.8-x86_64-linux → 1.17.0-x86_64-linux

data/ext/nokogiri/html4_sax_push_parser.c

@@ -3,13 +3,10 @@
 VALUE cNokogiriHtml4SaxPushParser;
 
 /*
- * call-seq:
- *  native_write(chunk, last_chunk)
- *
  * Write +chunk+ to PushParser. +last_chunk+ triggers the end_document handle
  */
 static VALUE
-native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
+noko_html4_sax_push_parser__native_write(VALUE self, VALUE rb_chunk, VALUE rb_last_chunk)
 {
   xmlParserCtxtPtr ctx;
   const char *chunk = NULL;
@@ -19,44 +16,45 @@ native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 
   ctx = noko_xml_sax_push_parser_unwrap(self);
 
-  if (Qnil != _chunk) {
-    chunk = StringValuePtr(_chunk);
-    size = (int)RSTRING_LEN(_chunk);
+  if (Qnil != rb_chunk) {
+    chunk = StringValuePtr(rb_chunk);
+    size = (int)RSTRING_LEN(rb_chunk);
   }
 
-  Nokogiri_structured_error_func_save_and_set(&handler_state, NULL, NULL);
+  noko__structured_error_func_save_and_set(&handler_state, NULL, NULL);
 
-  status = htmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0);
+  status = htmlParseChunk(ctx, chunk, size, Qtrue == rb_last_chunk ? 1 : 0);
 
-  Nokogiri_structured_error_func_restore(&handler_state);
+  noko__structured_error_func_restore(&handler_state);
 
-  if ((status != 0) && !(ctx->options & XML_PARSE_RECOVER)) {
+  if ((status != 0) && !(xmlCtxtGetOptions(ctx) & XML_PARSE_RECOVER)) {
     // TODO: there appear to be no tests for this block
     xmlErrorConstPtr e = xmlCtxtGetLastError(ctx);
-    Nokogiri_error_raise(NULL, e);
+    noko__error_raise(NULL, e);
   }
 
   return self;
 }
 
 /*
- * call-seq:
- *  initialize_native(xml_sax, filename)
- *
  * Initialize the push parser with +xml_sax+ using +filename+
  */
 static VALUE
-initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename,
-                  VALUE encoding)
+noko_html4_sax_push_parser__initialize_native(
+  VALUE self,
+  VALUE rb_xml_sax,
+  VALUE rb_filename,
+  VALUE encoding
+)
 {
   htmlSAXHandlerPtr sax;
   const char *filename = NULL;
   htmlParserCtxtPtr ctx;
   xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
 
-  sax = noko_sax_handler_unwrap(_xml_sax);
+  sax = noko_xml_sax_parser_unwrap(rb_xml_sax);
 
-  if (_filename != Qnil) { filename = StringValueCStr(_filename); }
+  if (rb_filename != Qnil) { filename = StringValueCStr(rb_filename); }
 
   if (!NIL_P(encoding)) {
     enc = xmlParseCharEncoding(StringValueCStr(encoding));
@@ -77,9 +75,9 @@ initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename,
     rb_raise(rb_eRuntimeError, "Could not create a parser context");
   }
 
-  ctx->userData = NOKOGIRI_SAX_TUPLE_NEW(ctx, self);
+  ctx->userData = ctx;
+  ctx->_private = (void *)rb_xml_sax;
 
-  ctx->sax2 = 1;
   DATA_PTR(self) = ctx;
   return self;
 }
@@ -88,8 +86,11 @@ void
 noko_init_html_sax_push_parser(void)
 {
   assert(cNokogiriXmlSaxPushParser);
-  cNokogiriHtml4SaxPushParser = rb_define_class_under(mNokogiriHtml4Sax, "PushParser", cNokogiriXmlSaxPushParser);
+  cNokogiriHtml4SaxPushParser =
+    rb_define_class_under(mNokogiriHtml4Sax, "PushParser", cNokogiriXmlSaxPushParser);
 
-  rb_define_private_method(cNokogiriHtml4SaxPushParser, "initialize_native", initialize_native, 3);
-  rb_define_private_method(cNokogiriHtml4SaxPushParser, "native_write", native_write, 2);
+  rb_define_private_method(cNokogiriHtml4SaxPushParser, "initialize_native",
+                           noko_html4_sax_push_parser__initialize_native, 3);
+  rb_define_private_method(cNokogiriHtml4SaxPushParser, "native_write",
+                           noko_html4_sax_push_parser__native_write, 2);
 }

data/ext/nokogiri/include/libexslt/exsltconfig.h

@@ -18,21 +18,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBEXSLT_DOTTED_VERSION "0.8.21"
+#define LIBEXSLT_DOTTED_VERSION "0.8.23"
 
 /**
  * LIBEXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBEXSLT_VERSION 821
+#define LIBEXSLT_VERSION 823
 
 /**
  * LIBEXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBEXSLT_VERSION_STRING "821"
+#define LIBEXSLT_VERSION_STRING "823"
 
 /**
  * LIBEXSLT_VERSION_EXTRA:

data/ext/nokogiri/include/libxml2/libxml/HTMLparser.h

@@ -80,22 +80,17 @@ struct _htmlEntityDesc {
     const char *desc;   /* the description */
 };
 
-/** DOC_DISABLE */
 #ifdef LIBXML_SAX1_ENABLED
-  #define XML_GLOBALS_HTML \
-    XML_OP(htmlDefaultSAXHandler, xmlSAXHandlerV1, XML_DEPRECATED)
-#else
-  #define XML_GLOBALS_HTML
-#endif
 
-#define XML_OP XML_DECLARE_GLOBAL
-XML_GLOBALS_HTML
-#undef XML_OP
+XML_DEPRECATED
+XMLPUBVAR const xmlSAXHandlerV1 htmlDefaultSAXHandler;
 
-#if defined(LIBXML_THREAD_ENABLED) && !defined(XML_GLOBALS_NO_REDEFINITION)
-  #define htmlDefaultSAXHandler XML_GLOBAL_MACRO(htmlDefaultSAXHandler)
+#ifdef LIBXML_THREAD_ENABLED
+XML_DEPRECATED
+XMLPUBFUN const xmlSAXHandlerV1 *__htmlDefaultSAXHandler(void);
 #endif
-/** DOC_ENABLE */
+
+#endif /* LIBXML_SAX1_ENABLED */
 
 /*
  * There is only few public functions.
@@ -173,6 +168,7 @@ XMLPUBFUN int
 					 int *inlen, int quoteChar);
 XMLPUBFUN int
 			htmlIsScriptAttribute(const xmlChar *name);
+XML_DEPRECATED
 XMLPUBFUN int
 			htmlHandleOmittedElem(int val);
 
@@ -251,6 +247,9 @@ XMLPUBFUN htmlDocPtr
 					 const char *URL,
 					 const char *encoding,
 					 int options);
+XMLPUBFUN htmlDocPtr
+		htmlCtxtParseDocument	(htmlParserCtxtPtr ctxt,
+					 xmlParserInputPtr input);
 XMLPUBFUN htmlDocPtr
 		htmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
 					 const xmlChar *cur,
@@ -300,7 +299,7 @@ typedef enum {
 XMLPUBFUN htmlStatus htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
 XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
 XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
-XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
+XMLPUBFUN htmlStatus htmlNodeStatus(htmlNodePtr, int) ;
 /**
  * htmlDefaultSubelement:
  * @elt: HTML element
@@ -333,11 +332,5 @@ XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
 }
 #endif
 
-#else /* LIBXML_HTML_ENABLED */
-
-/** DOC_DISABLE */
-#define XML_GLOBALS_HTML
-/** DOC_ENABLE */
-
 #endif /* LIBXML_HTML_ENABLED */
 #endif /* __HTML_PARSER_H__ */

data/ext/nokogiri/include/libxml2/libxml/c14n.h

@@ -39,18 +39,7 @@ extern "C" {
  *  a) default attributes (if any) are added to all nodes
  *  b) all character and parsed entity references are resolved
  * In order to achieve this in libxml2 the document MUST be loaded with
- * following global settings:
- *
- *    xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
- *    xmlSubstituteEntitiesDefault(1);
- *
- * or corresponding parser context setting:
- *    xmlParserCtxtPtr ctxt;
- *
- *    ...
- *    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
- *    ctxt->replaceEntities = 1;
- *    ...
+ * following options: XML_PARSE_DTDATTR | XML_PARSE_NOENT
  */
 
 /*

data/ext/nokogiri/include/libxml2/libxml/debugXML.h

@@ -203,7 +203,7 @@ XMLPUBFUN int
  */
 XMLPUBFUN void
 	xmlShell		(xmlDocPtr doc,
-				 char *filename,
+				 const char *filename,
 				 xmlShellReadlineFunc input,
 				 FILE *output);
 

data/ext/nokogiri/include/libxml2/libxml/encoding.h

@@ -162,6 +162,13 @@ XMLPUBFUN void
 	xmlCleanupCharEncodingHandlers	(void);
 XMLPUBFUN void
 	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler);
+XMLPUBFUN int
+	xmlLookupCharEncodingHandler	(xmlCharEncoding enc,
+					 xmlCharEncodingHandlerPtr *out);
+XMLPUBFUN int
+	xmlOpenCharEncodingHandler	(const char *name,
+					 int output,
+					 xmlCharEncodingHandlerPtr *out);
 XMLPUBFUN xmlCharEncodingHandlerPtr
 	xmlGetCharEncodingHandler	(xmlCharEncoding enc);
 XMLPUBFUN xmlCharEncodingHandlerPtr
@@ -195,7 +202,9 @@ XMLPUBFUN xmlCharEncoding
 	xmlDetectCharEncoding		(const unsigned char *in,
 					 int len);
 
+/** DOC_DISABLE */
 struct _xmlBuffer;
+/** DOC_ENABLE */
 XMLPUBFUN int
 	xmlCharEncOutFunc		(xmlCharEncodingHandler *handler,
 					 struct _xmlBuffer *out,

data/ext/nokogiri/include/libxml2/libxml/entities.h

@@ -11,10 +11,12 @@
 #ifndef __XML_ENTITIES_H__
 #define __XML_ENTITIES_H__
 
+/** DOC_DISABLE */
 #include <libxml/xmlversion.h>
 #define XML_TREE_INTERNALS
 #include <libxml/tree.h>
 #undef XML_TREE_INTERNALS
+/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +59,7 @@ struct _xmlEntity {
 
     struct _xmlEntity     *nexte;	/* unused */
     const xmlChar           *URI;	/* the full URI as computed */
-    int                    owner;	/* does the entity own the childrens */
+    int                    owner;	/* unused */
     int                    flags;       /* various flags */
     unsigned long   expandedSize;       /* expanded size */
 };
@@ -89,6 +91,15 @@ XMLPUBFUN xmlEntityPtr
 						 const xmlChar *content);
 XMLPUBFUN void
 			xmlFreeEntity		(xmlEntityPtr entity);
+XMLPUBFUN int
+			xmlAddEntity		(xmlDocPtr doc,
+						 int extSubset,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content,
+						 xmlEntityPtr *out);
 XMLPUBFUN xmlEntityPtr
 			xmlAddDocEntity		(xmlDocPtr doc,
 						 const xmlChar *name,

data/ext/nokogiri/include/libxml2/libxml/hash.h

@@ -109,6 +109,10 @@ XMLPUBFUN void
 /*
  * Add a new entry to the hash table.
  */
+XMLPUBFUN int
+		xmlHashAdd		(xmlHashTablePtr hash,
+		                         const xmlChar *name,
+		                         void *userdata);
 XMLPUBFUN int
 		xmlHashAddEntry		(xmlHashTablePtr hash,
 		                         const xmlChar *name,
@@ -118,6 +122,11 @@ XMLPUBFUN int
 		                         const xmlChar *name,
 		                         void *userdata,
 					 xmlHashDeallocator dealloc);
+XMLPUBFUN int
+		xmlHashAdd2		(xmlHashTablePtr hash,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         void *userdata);
 XMLPUBFUN int
 		xmlHashAddEntry2	(xmlHashTablePtr hash,
 		                         const xmlChar *name,
@@ -129,6 +138,12 @@ XMLPUBFUN int
 		                         const xmlChar *name2,
 		                         void *userdata,
 					 xmlHashDeallocator dealloc);
+XMLPUBFUN int
+		xmlHashAdd3		(xmlHashTablePtr hash,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         const xmlChar *name3,
+		                         void *userdata);
 XMLPUBFUN int
 		xmlHashAddEntry3	(xmlHashTablePtr hash,
 		                         const xmlChar *name,
@@ -199,6 +214,10 @@ XMLPUBFUN void *
 /*
  * Helpers.
  */
+XMLPUBFUN xmlHashTablePtr
+		xmlHashCopySafe		(xmlHashTablePtr hash,
+					 xmlHashCopier copy,
+					 xmlHashDeallocator dealloc);
 XMLPUBFUN xmlHashTablePtr
 		xmlHashCopy		(xmlHashTablePtr hash,
 					 xmlHashCopier copy);

data/ext/nokogiri/include/libxml2/libxml/list.h

@@ -119,10 +119,10 @@ XMLPUBFUN void
 		xmlListMerge		(xmlListPtr l1,
 					 xmlListPtr l2);
 XMLPUBFUN xmlListPtr
-		xmlListDup		(const xmlListPtr old);
+		xmlListDup		(xmlListPtr old);
 XMLPUBFUN int
 		xmlListCopy		(xmlListPtr cur,
-					 const xmlListPtr old);
+					 xmlListPtr old);
 /* Link operators */
 XMLPUBFUN void *
 		xmlLinkGetData          (xmlLinkPtr lk);

data/ext/nokogiri/include/libxml2/libxml/nanohttp.h

@@ -18,16 +18,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlNanoHTTPInit		(void);
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlNanoHTTPCleanup	(void);
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlNanoHTTPScanProxy	(const char *URL);
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlNanoHTTPFetch	(const char *URL,
 				 const char *filename,
 				 char **contentType);
+XML_DEPRECATED
 XMLPUBFUN void *
 	xmlNanoHTTPMethod	(const char *URL,
 				 const char *method,
@@ -35,6 +40,7 @@ XMLPUBFUN void *
 				 char **contentType,
 				 const char *headers,
 				 int   ilen);
+XML_DEPRECATED
 XMLPUBFUN void *
 	xmlNanoHTTPMethodRedir	(const char *URL,
 				 const char *method,
@@ -43,34 +49,45 @@ XMLPUBFUN void *
 				 char **redir,
 				 const char *headers,
 				 int   ilen);
+XML_DEPRECATED
 XMLPUBFUN void *
 	xmlNanoHTTPOpen		(const char *URL,
 				 char **contentType);
+XML_DEPRECATED
 XMLPUBFUN void *
 	xmlNanoHTTPOpenRedir	(const char *URL,
 				 char **contentType,
 				 char **redir);
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlNanoHTTPReturnCode	(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN const char *
 	xmlNanoHTTPAuthHeader	(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN const char *
 	xmlNanoHTTPRedir	(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlNanoHTTPContentLength( void * ctx );
+XML_DEPRECATED
 XMLPUBFUN const char *
 	xmlNanoHTTPEncoding	(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN const char *
 	xmlNanoHTTPMimeType	(void *ctx);
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlNanoHTTPRead		(void *ctx,
 				 void *dest,
 				 int len);
 #ifdef LIBXML_OUTPUT_ENABLED
+XML_DEPRECATED
 XMLPUBFUN int
 	xmlNanoHTTPSave		(void *ctxt,
 				 const char *filename);
 #endif /* LIBXML_OUTPUT_ENABLED */
+XML_DEPRECATED
 XMLPUBFUN void
 	xmlNanoHTTPClose	(void *ctx);
 #ifdef __cplusplus