nokogiri 1.10.6-java → 1.11.0-java
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of nokogiri might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +3 -0
- data/LICENSE-DEPENDENCIES.md +1015 -947
- data/README.md +165 -91
- data/ext/java/nokogiri/HtmlDocument.java +34 -46
- data/ext/java/nokogiri/HtmlSaxParserContext.java +88 -58
- data/ext/java/nokogiri/HtmlSaxPushParser.java +1 -1
- data/ext/java/nokogiri/NokogiriService.java +1 -1
- data/ext/java/nokogiri/XmlAttr.java +13 -20
- data/ext/java/nokogiri/XmlAttributeDecl.java +11 -12
- data/ext/java/nokogiri/XmlCdata.java +3 -4
- data/ext/java/nokogiri/XmlComment.java +1 -1
- data/ext/java/nokogiri/XmlDocument.java +148 -175
- data/ext/java/nokogiri/XmlDocumentFragment.java +13 -31
- data/ext/java/nokogiri/XmlDtd.java +5 -8
- data/ext/java/nokogiri/XmlElement.java +1 -20
- data/ext/java/nokogiri/XmlElementDecl.java +23 -28
- data/ext/java/nokogiri/XmlEntityDecl.java +23 -27
- data/ext/java/nokogiri/XmlEntityReference.java +2 -2
- data/ext/java/nokogiri/XmlNamespace.java +72 -89
- data/ext/java/nokogiri/XmlNode.java +303 -406
- data/ext/java/nokogiri/XmlNodeSet.java +72 -77
- data/ext/java/nokogiri/XmlReader.java +12 -13
- data/ext/java/nokogiri/XmlRelaxng.java +10 -3
- data/ext/java/nokogiri/XmlSaxParserContext.java +15 -10
- data/ext/java/nokogiri/XmlSchema.java +87 -27
- data/ext/java/nokogiri/XmlSyntaxError.java +2 -6
- data/ext/java/nokogiri/XmlText.java +12 -9
- data/ext/java/nokogiri/XmlXpathContext.java +55 -25
- data/ext/java/nokogiri/XsltStylesheet.java +7 -15
- data/ext/java/nokogiri/internals/HtmlDomParserContext.java +52 -46
- data/ext/java/nokogiri/internals/NokogiriHandler.java +1 -1
- data/ext/java/nokogiri/internals/NokogiriHelpers.java +71 -135
- data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +90 -58
- data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +9 -2
- data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +67 -10
- data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +4 -2
- data/ext/java/nokogiri/internals/ParserContext.java +27 -73
- data/ext/java/nokogiri/internals/ReaderNode.java +2 -4
- data/ext/java/nokogiri/internals/XmlDomParserContext.java +18 -33
- data/ext/nokogiri/depend +476 -357
- data/ext/nokogiri/extconf.rb +507 -357
- data/ext/nokogiri/html_document.c +79 -78
- data/ext/nokogiri/html_sax_parser_context.c +2 -2
- data/ext/nokogiri/nokogiri.c +34 -40
- data/ext/nokogiri/xml_document.c +18 -4
- data/ext/nokogiri/xml_io.c +8 -6
- data/ext/nokogiri/xml_node.c +21 -1
- data/ext/nokogiri/xml_node_set.c +1 -1
- data/ext/nokogiri/xml_reader.c +6 -17
- data/ext/nokogiri/xml_relax_ng.c +29 -11
- data/ext/nokogiri/xml_sax_parser.c +2 -7
- data/ext/nokogiri/xml_sax_parser_context.c +2 -2
- data/ext/nokogiri/xml_schema.c +84 -13
- data/ext/nokogiri/xml_xpath_context.c +80 -4
- data/ext/nokogiri/xslt_stylesheet.c +1 -8
- data/lib/nokogiri.rb +22 -22
- data/lib/nokogiri/css.rb +1 -0
- data/lib/nokogiri/css/node.rb +1 -0
- data/lib/nokogiri/css/parser.rb +63 -62
- data/lib/nokogiri/css/parser.y +2 -2
- data/lib/nokogiri/css/parser_extras.rb +39 -36
- data/lib/nokogiri/css/syntax_error.rb +1 -0
- data/lib/nokogiri/css/tokenizer.rb +1 -0
- data/lib/nokogiri/css/xpath_visitor.rb +73 -43
- data/lib/nokogiri/decorators/slop.rb +1 -0
- data/lib/nokogiri/html.rb +1 -0
- data/lib/nokogiri/html/builder.rb +1 -0
- data/lib/nokogiri/html/document.rb +13 -26
- data/lib/nokogiri/html/document_fragment.rb +1 -0
- data/lib/nokogiri/html/element_description.rb +1 -0
- data/lib/nokogiri/html/element_description_defaults.rb +1 -0
- data/lib/nokogiri/html/entity_lookup.rb +1 -0
- data/lib/nokogiri/html/sax/parser.rb +1 -0
- data/lib/nokogiri/html/sax/parser_context.rb +1 -0
- data/lib/nokogiri/html/sax/push_parser.rb +1 -0
- data/lib/nokogiri/jruby/dependencies.rb +20 -0
- data/lib/nokogiri/nokogiri.jar +0 -0
- data/lib/nokogiri/syntax_error.rb +1 -0
- data/lib/nokogiri/version.rb +3 -109
- data/lib/nokogiri/version/constant.rb +5 -0
- data/lib/nokogiri/version/info.rb +182 -0
- data/lib/nokogiri/xml.rb +1 -0
- data/lib/nokogiri/xml/attr.rb +1 -0
- data/lib/nokogiri/xml/attribute_decl.rb +1 -0
- data/lib/nokogiri/xml/builder.rb +3 -2
- data/lib/nokogiri/xml/cdata.rb +1 -0
- data/lib/nokogiri/xml/character_data.rb +1 -0
- data/lib/nokogiri/xml/document.rb +20 -15
- data/lib/nokogiri/xml/document_fragment.rb +5 -6
- data/lib/nokogiri/xml/dtd.rb +1 -0
- data/lib/nokogiri/xml/element_content.rb +1 -0
- data/lib/nokogiri/xml/element_decl.rb +1 -0
- data/lib/nokogiri/xml/entity_decl.rb +1 -0
- data/lib/nokogiri/xml/entity_reference.rb +1 -0
- data/lib/nokogiri/xml/namespace.rb +1 -0
- data/lib/nokogiri/xml/node.rb +587 -249
- data/lib/nokogiri/xml/node/save_options.rb +1 -0
- data/lib/nokogiri/xml/node_set.rb +1 -0
- data/lib/nokogiri/xml/notation.rb +1 -0
- data/lib/nokogiri/xml/parse_options.rb +10 -3
- data/lib/nokogiri/xml/pp.rb +1 -0
- data/lib/nokogiri/xml/pp/character_data.rb +1 -0
- data/lib/nokogiri/xml/pp/node.rb +1 -0
- data/lib/nokogiri/xml/processing_instruction.rb +1 -0
- data/lib/nokogiri/xml/reader.rb +7 -3
- data/lib/nokogiri/xml/relax_ng.rb +7 -2
- data/lib/nokogiri/xml/sax.rb +1 -0
- data/lib/nokogiri/xml/sax/document.rb +1 -0
- data/lib/nokogiri/xml/sax/parser.rb +1 -0
- data/lib/nokogiri/xml/sax/parser_context.rb +1 -0
- data/lib/nokogiri/xml/sax/push_parser.rb +1 -0
- data/lib/nokogiri/xml/schema.rb +13 -4
- data/lib/nokogiri/xml/searchable.rb +25 -16
- data/lib/nokogiri/xml/syntax_error.rb +1 -0
- data/lib/nokogiri/xml/text.rb +1 -0
- data/lib/nokogiri/xml/xpath.rb +1 -0
- data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -0
- data/lib/nokogiri/xml/xpath_context.rb +1 -0
- data/lib/nokogiri/xslt.rb +1 -0
- data/lib/nokogiri/xslt/stylesheet.rb +1 -0
- data/lib/xsd/xmlparser/nokogiri.rb +1 -0
- metadata +92 -157
- data/ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java +0 -107
- data/ext/java/nokogiri/internals/UncloseableInputStream.java +0 -102
- data/ext/nokogiri/html_document.h +0 -10
- data/ext/nokogiri/html_element_description.h +0 -10
- data/ext/nokogiri/html_entity_lookup.h +0 -8
- data/ext/nokogiri/html_sax_parser_context.h +0 -11
- data/ext/nokogiri/html_sax_push_parser.h +0 -9
- data/ext/nokogiri/nokogiri.h +0 -121
- data/ext/nokogiri/xml_attr.h +0 -9
- data/ext/nokogiri/xml_attribute_decl.h +0 -9
- data/ext/nokogiri/xml_cdata.h +0 -9
- data/ext/nokogiri/xml_comment.h +0 -9
- data/ext/nokogiri/xml_document.h +0 -23
- data/ext/nokogiri/xml_document_fragment.h +0 -10
- data/ext/nokogiri/xml_dtd.h +0 -10
- data/ext/nokogiri/xml_element_content.h +0 -10
- data/ext/nokogiri/xml_element_decl.h +0 -9
- data/ext/nokogiri/xml_encoding_handler.h +0 -8
- data/ext/nokogiri/xml_entity_decl.h +0 -10
- data/ext/nokogiri/xml_entity_reference.h +0 -9
- data/ext/nokogiri/xml_io.h +0 -11
- data/ext/nokogiri/xml_libxml2_hacks.h +0 -12
- data/ext/nokogiri/xml_namespace.h +0 -14
- data/ext/nokogiri/xml_node.h +0 -13
- data/ext/nokogiri/xml_node_set.h +0 -12
- data/ext/nokogiri/xml_processing_instruction.h +0 -9
- data/ext/nokogiri/xml_reader.h +0 -10
- data/ext/nokogiri/xml_relax_ng.h +0 -9
- data/ext/nokogiri/xml_sax_parser.h +0 -39
- data/ext/nokogiri/xml_sax_parser_context.h +0 -10
- data/ext/nokogiri/xml_sax_push_parser.h +0 -9
- data/ext/nokogiri/xml_schema.h +0 -9
- data/ext/nokogiri/xml_syntax_error.h +0 -13
- data/ext/nokogiri/xml_text.h +0 -9
- data/ext/nokogiri/xml_xpath_context.h +0 -10
- data/ext/nokogiri/xslt_stylesheet.h +0 -14
- data/patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch +0 -78
- data/patches/libxml2/0002-Remove-script-macro-support.patch +0 -40
- data/patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch +0 -44
data/ext/nokogiri/xml_dtd.h
DELETED
data/ext/nokogiri/xml_io.h
DELETED
@@ -1,11 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_IO
|
2
|
-
#define NOKOGIRI_XML_IO
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
int io_read_callback(void * ctx, char * buffer, int len);
|
7
|
-
int io_write_callback(void * ctx, char * buffer, int len);
|
8
|
-
int io_close_callback(void * ctx);
|
9
|
-
void init_nokogiri_io();
|
10
|
-
|
11
|
-
#endif
|
@@ -1,12 +0,0 @@
|
|
1
|
-
#ifndef HAVE_XMLFIRSTELEMENTCHILD
|
2
|
-
|
3
|
-
#ifndef XML_LIBXML2_HACKS
|
4
|
-
#define XML_LIBXML2_HACKS
|
5
|
-
|
6
|
-
xmlNodePtr xmlFirstElementChild(xmlNodePtr parent);
|
7
|
-
xmlNodePtr xmlNextElementSibling(xmlNodePtr node);
|
8
|
-
xmlNodePtr xmlLastElementChild(xmlNodePtr parent);
|
9
|
-
|
10
|
-
#endif
|
11
|
-
|
12
|
-
#endif
|
@@ -1,14 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_NAMESPACE
|
2
|
-
#define NOKOGIRI_XML_NAMESPACE
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xml_namespace();
|
7
|
-
|
8
|
-
extern VALUE cNokogiriXmlNamespace ;
|
9
|
-
|
10
|
-
VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node);
|
11
|
-
|
12
|
-
#define NOKOGIRI_NAMESPACE_EH(node) ((node)->type == XML_NAMESPACE_DECL)
|
13
|
-
|
14
|
-
#endif
|
data/ext/nokogiri/xml_node.h
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_NODE
|
2
|
-
#define NOKOGIRI_XML_NODE
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xml_node();
|
7
|
-
|
8
|
-
extern VALUE cNokogiriXmlNode ;
|
9
|
-
extern VALUE cNokogiriXmlElement ;
|
10
|
-
|
11
|
-
VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node) ;
|
12
|
-
void Nokogiri_xml_node_properties(xmlNodePtr node, VALUE attr_hash) ;
|
13
|
-
#endif
|
data/ext/nokogiri/xml_node_set.h
DELETED
@@ -1,12 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_NODE_SET
|
2
|
-
#define NOKOGIRI_XML_NODE_SET
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
void init_xml_node_set();
|
6
|
-
|
7
|
-
extern VALUE cNokogiriXmlNodeSet ;
|
8
|
-
VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document) ;
|
9
|
-
VALUE Nokogiri_wrap_xml_node_set_node(xmlNodePtr node, VALUE node_set) ;
|
10
|
-
VALUE Nokogiri_wrap_xml_node_set_namespace(xmlNsPtr node, VALUE node_set) ;
|
11
|
-
|
12
|
-
#endif
|
data/ext/nokogiri/xml_reader.h
DELETED
data/ext/nokogiri/xml_relax_ng.h
DELETED
@@ -1,39 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_SAX_PARSER
|
2
|
-
#define NOKOGIRI_XML_SAX_PARSER
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xml_sax_parser();
|
7
|
-
|
8
|
-
extern VALUE cNokogiriXmlSaxParser ;
|
9
|
-
|
10
|
-
typedef struct _nokogiriSAXTuple {
|
11
|
-
xmlParserCtxtPtr ctxt;
|
12
|
-
VALUE self;
|
13
|
-
} nokogiriSAXTuple;
|
14
|
-
|
15
|
-
typedef nokogiriSAXTuple * nokogiriSAXTuplePtr;
|
16
|
-
|
17
|
-
#define NOKOGIRI_SAX_SELF(_ctxt) \
|
18
|
-
((nokogiriSAXTuplePtr)(_ctxt))->self
|
19
|
-
|
20
|
-
#define NOKOGIRI_SAX_CTXT(_ctxt) \
|
21
|
-
((nokogiriSAXTuplePtr)(_ctxt))->ctxt
|
22
|
-
|
23
|
-
#define NOKOGIRI_SAX_TUPLE_NEW(_ctxt, _self) \
|
24
|
-
nokogiri_sax_tuple_new(_ctxt, _self)
|
25
|
-
|
26
|
-
static inline nokogiriSAXTuplePtr
|
27
|
-
nokogiri_sax_tuple_new(xmlParserCtxtPtr ctxt, VALUE self)
|
28
|
-
{
|
29
|
-
nokogiriSAXTuplePtr tuple = malloc(sizeof(nokogiriSAXTuple));
|
30
|
-
tuple->self = self;
|
31
|
-
tuple->ctxt = ctxt;
|
32
|
-
return tuple;
|
33
|
-
}
|
34
|
-
|
35
|
-
#define NOKOGIRI_SAX_TUPLE_DESTROY(_tuple) \
|
36
|
-
free(_tuple) \
|
37
|
-
|
38
|
-
#endif
|
39
|
-
|
data/ext/nokogiri/xml_schema.h
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_SYNTAX_ERROR
|
2
|
-
#define NOKOGIRI_XML_SYNTAX_ERROR
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xml_syntax_error();
|
7
|
-
VALUE Nokogiri_wrap_xml_syntax_error(xmlErrorPtr error);
|
8
|
-
void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error);
|
9
|
-
NORETURN(void Nokogiri_error_raise(void * ctx, xmlErrorPtr error));
|
10
|
-
|
11
|
-
extern VALUE cNokogiriXmlSyntaxError;
|
12
|
-
#endif
|
13
|
-
|
data/ext/nokogiri/xml_text.h
DELETED
@@ -1,10 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XML_XPATH_CONTEXT
|
2
|
-
#define NOKOGIRI_XML_XPATH_CONTEXT
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xml_xpath_context();
|
7
|
-
void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name) ;
|
8
|
-
|
9
|
-
extern VALUE cNokogiriXmlXpathContext;
|
10
|
-
#endif
|
@@ -1,14 +0,0 @@
|
|
1
|
-
#ifndef NOKOGIRI_XSLT_STYLESHEET
|
2
|
-
#define NOKOGIRI_XSLT_STYLESHEET
|
3
|
-
|
4
|
-
#include <nokogiri.h>
|
5
|
-
|
6
|
-
void init_xslt_stylesheet();
|
7
|
-
|
8
|
-
extern VALUE cNokogiriXsltStylesheet ;
|
9
|
-
|
10
|
-
typedef struct _nokogiriXsltStylesheetTuple {
|
11
|
-
xsltStylesheetPtr ss;
|
12
|
-
VALUE func_instances;
|
13
|
-
} nokogiriXsltStylesheetTuple;
|
14
|
-
#endif
|
@@ -1,78 +0,0 @@
|
|
1
|
-
From c5538465c08a8ea248a370bf55bc39cd3385e4af Mon Sep 17 00:00:00 2001
|
2
|
-
From: Mike Dalessio <mike.dalessio@gmail.com>
|
3
|
-
Date: Thu, 29 Mar 2018 14:09:00 -0400
|
4
|
-
Subject: [PATCH] Revert "Do not URI escape in server side includes"
|
5
|
-
|
6
|
-
This reverts commit 960f0e275616cadc29671a218d7fb9b69eb35588.
|
7
|
-
---
|
8
|
-
HTMLtree.c | 49 +++++++++++--------------------------------------
|
9
|
-
1 file changed, 11 insertions(+), 38 deletions(-)
|
10
|
-
|
11
|
-
diff --git a/HTMLtree.c b/HTMLtree.c
|
12
|
-
index 2fd0c9c..67160c5 100644
|
13
|
-
--- a/HTMLtree.c
|
14
|
-
+++ b/HTMLtree.c
|
15
|
-
@@ -717,49 +717,22 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur,
|
16
|
-
(!xmlStrcasecmp(cur->name, BAD_CAST "src")) ||
|
17
|
-
((!xmlStrcasecmp(cur->name, BAD_CAST "name")) &&
|
18
|
-
(!xmlStrcasecmp(cur->parent->name, BAD_CAST "a"))))) {
|
19
|
-
+ xmlChar *escaped;
|
20
|
-
xmlChar *tmp = value;
|
21
|
-
- /* xmlURIEscapeStr() escapes '"' so it can be safely used. */
|
22
|
-
- xmlBufCCat(buf->buffer, "\"");
|
23
|
-
|
24
|
-
while (IS_BLANK_CH(*tmp)) tmp++;
|
25
|
-
|
26
|
-
- /* URI Escape everything, except server side includes. */
|
27
|
-
- for ( ; ; ) {
|
28
|
-
- xmlChar *escaped;
|
29
|
-
- xmlChar endChar;
|
30
|
-
- xmlChar *end = NULL;
|
31
|
-
- xmlChar *start = (xmlChar *)xmlStrstr(tmp, BAD_CAST "<!--");
|
32
|
-
- if (start != NULL) {
|
33
|
-
- end = (xmlChar *)xmlStrstr(tmp, BAD_CAST "-->");
|
34
|
-
- if (end != NULL) {
|
35
|
-
- *start = '\0';
|
36
|
-
- }
|
37
|
-
- }
|
38
|
-
-
|
39
|
-
- /* Escape the whole string, or until start (set to '\0'). */
|
40
|
-
- escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+");
|
41
|
-
- if (escaped != NULL) {
|
42
|
-
- xmlBufCat(buf->buffer, escaped);
|
43
|
-
- xmlFree(escaped);
|
44
|
-
- } else {
|
45
|
-
- xmlBufCat(buf->buffer, tmp);
|
46
|
-
- }
|
47
|
-
-
|
48
|
-
- if (end == NULL) { /* Everything has been written. */
|
49
|
-
- break;
|
50
|
-
- }
|
51
|
-
-
|
52
|
-
- /* Do not escape anything within server side includes. */
|
53
|
-
- *start = '<'; /* Restore the first character of "<!--". */
|
54
|
-
- end += 3; /* strlen("-->") */
|
55
|
-
- endChar = *end;
|
56
|
-
- *end = '\0';
|
57
|
-
- xmlBufCat(buf->buffer, start);
|
58
|
-
- *end = endChar;
|
59
|
-
- tmp = end;
|
60
|
-
+ /*
|
61
|
-
+ * the < and > have already been escaped at the entity level
|
62
|
-
+ * And doing so here breaks server side includes
|
63
|
-
+ */
|
64
|
-
+ escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+<>");
|
65
|
-
+ if (escaped != NULL) {
|
66
|
-
+ xmlBufWriteQuotedString(buf->buffer, escaped);
|
67
|
-
+ xmlFree(escaped);
|
68
|
-
+ } else {
|
69
|
-
+ xmlBufWriteQuotedString(buf->buffer, value);
|
70
|
-
}
|
71
|
-
-
|
72
|
-
- xmlBufCCat(buf->buffer, "\"");
|
73
|
-
} else {
|
74
|
-
xmlBufWriteQuotedString(buf->buffer, value);
|
75
|
-
}
|
76
|
-
--
|
77
|
-
2.9.5
|
78
|
-
|
@@ -1,40 +0,0 @@
|
|
1
|
-
From 27e4aa8d885e47a296ea78d114dbbe8fc7aa3508 Mon Sep 17 00:00:00 2001
|
2
|
-
From: Kevin Solorio <soloriok@gmail.com>
|
3
|
-
Date: Fri, 1 Feb 2019 14:32:42 -0800
|
4
|
-
Subject: [PATCH] Revert-support-html-h-b-7-1
|
5
|
-
|
6
|
-
---
|
7
|
-
entities.c | 17 -----------------
|
8
|
-
1 file changed, 17 deletions(-)
|
9
|
-
|
10
|
-
diff --git a/entities.c b/entities.c
|
11
|
-
index 43549bc5..82652f6d 100644
|
12
|
-
--- a/entities.c
|
13
|
-
+++ b/entities.c
|
14
|
-
@@ -623,23 +623,6 @@ xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input, int attr) {
|
15
|
-
*out++ = 't';
|
16
|
-
*out++ = ';';
|
17
|
-
} else if (*cur == '&') {
|
18
|
-
- /*
|
19
|
-
- * Special handling of &{...} construct from HTML 4, see
|
20
|
-
- * http://www.w3.org/TR/html401/appendix/notes.html#h-B.7.1
|
21
|
-
- */
|
22
|
-
- if (html && attr && (cur[1] == '{') &&
|
23
|
-
- (strchr((const char *) cur, '}'))) {
|
24
|
-
- while (*cur != '}') {
|
25
|
-
- *out++ = *cur++;
|
26
|
-
- indx = out - buffer;
|
27
|
-
- if (indx + 100 > buffer_size) {
|
28
|
-
- growBufferReentrant();
|
29
|
-
- out = &buffer[indx];
|
30
|
-
- }
|
31
|
-
- }
|
32
|
-
- *out++ = *cur++;
|
33
|
-
- continue;
|
34
|
-
- }
|
35
|
-
*out++ = '&';
|
36
|
-
*out++ = 'a';
|
37
|
-
*out++ = 'm';
|
38
|
-
--
|
39
|
-
2.16.2
|
40
|
-
|
@@ -1,44 +0,0 @@
|
|
1
|
-
From ffc08467744bd2305d41ca882c37fa30adf3a067 Mon Sep 17 00:00:00 2001
|
2
|
-
From: Kevin Solorio <soloriok@gmail.com>
|
3
|
-
Date: Wed, 27 Feb 2019 14:34:17 -0800
|
4
|
-
Subject: [PATCH 2/2] update entities.c to remove handling of ssi
|
5
|
-
|
6
|
-
---
|
7
|
-
entities.c | 21 ---------------------
|
8
|
-
1 file changed, 21 deletions(-)
|
9
|
-
|
10
|
-
diff --git a/entities.c b/entities.c
|
11
|
-
index 43549bc5..5c4a2a60 100644
|
12
|
-
--- a/entities.c
|
13
|
-
+++ b/entities.c
|
14
|
-
@@ -592,27 +592,6 @@ xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input, int attr) {
|
15
|
-
* By default one have to encode at least '<', '>', '"' and '&' !
|
16
|
-
*/
|
17
|
-
if (*cur == '<') {
|
18
|
-
- const xmlChar *end;
|
19
|
-
-
|
20
|
-
- /*
|
21
|
-
- * Special handling of server side include in HTML attributes
|
22
|
-
- */
|
23
|
-
- if (html && attr &&
|
24
|
-
- (cur[1] == '!') && (cur[2] == '-') && (cur[3] == '-') &&
|
25
|
-
- ((end = xmlStrstr(cur, BAD_CAST "-->")) != NULL)) {
|
26
|
-
- while (cur != end) {
|
27
|
-
- *out++ = *cur++;
|
28
|
-
- indx = out - buffer;
|
29
|
-
- if (indx + 100 > buffer_size) {
|
30
|
-
- growBufferReentrant();
|
31
|
-
- out = &buffer[indx];
|
32
|
-
- }
|
33
|
-
- }
|
34
|
-
- *out++ = *cur++;
|
35
|
-
- *out++ = *cur++;
|
36
|
-
- *out++ = *cur++;
|
37
|
-
- continue;
|
38
|
-
- }
|
39
|
-
*out++ = '&';
|
40
|
-
*out++ = 'l';
|
41
|
-
*out++ = 't';
|
42
|
-
--
|
43
|
-
2.16.2
|
44
|
-
|