Skip to content

Commit 413b26c

Browse files
kiyoleekiyolee
committed
Update to libxml2-2.13.1
1 parent e63701c commit 413b26c

24 files changed

+166
-103
lines changed

‎HTMLparser.c

+4-7
Original file line numberDiff line numberDiff line change
@@ -4753,12 +4753,9 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
47534753
if ((ctxt == NULL) || (ctxt->input == NULL))
47544754
return(-1);
47554755

4756-
/*
4757-
* Document locator is unused. Only for backward compatibility.
4758-
*/
47594756
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) {
4760-
xmlSAXLocator copy = xmlDefaultSAXLocator;
4761-
ctxt->sax->setDocumentLocator(ctxt->userData, &copy);
4757+
ctxt->sax->setDocumentLocator(ctxt->userData,
4758+
(xmlSAXLocator *) &xmlDefaultSAXLocator);
47624759
}
47634760

47644761
xmlDetectEncoding(ctxt);
@@ -5297,8 +5294,8 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
52975294
avail = in->end - in->cur;
52985295
}
52995296
if ((ctxt->sax) && (ctxt->sax->setDocumentLocator)) {
5300-
xmlSAXLocator copy = xmlDefaultSAXLocator;
5301-
ctxt->sax->setDocumentLocator(ctxt->userData, &copy);
5297+
ctxt->sax->setDocumentLocator(ctxt->userData,
5298+
(xmlSAXLocator *) &xmlDefaultSAXLocator);
53025299
}
53035300
if ((ctxt->sax) && (ctxt->sax->startDocument) &&
53045301
(!ctxt->disableSAX))

‎NEWS

+28-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
NEWS file for libxml2
22

3+
v2.13.1: Jun 19 2024
4+
5+
### Regressions
6+
7+
- parser: Selectively reenable reading from "-"
8+
- reader: Fix xmlTextReaderReadString
9+
- xinclude: Set XPath context doc
10+
- xinclude: Load included documents with XML_PARSE_DTDLOAD
11+
- include: Don't redefine ATTRIBUTE_UNUSED
12+
- include: Readd circular dependency between tree.h and parser.h
13+
- xinclude: Add missing include (Jan Alexander Steffens (heftig))
14+
- win32, msvc: fix missing linking against Bcrypt.lib (Miklos Vajna)
15+
- xinclude: Don't raise error on empty nodeset
16+
- parser: Make failure to load main document a warning
17+
- tree: Fix freeing entities via xmlFreeNode
18+
- parser: Pass global object to sax->setDocumentLocator
19+
20+
### Improvements
21+
22+
- io: Fix resetting xmlParserInputBufferCreateFilename hook
23+
24+
### Documentation
25+
26+
- Fix typo in NEWS (--with-html -> --with-http) (Ryan Carsten Schmidt)
27+
- doc: Don't mention xmlNewInputURL
28+
29+
330
v2.13.0: Jun 12 2024
431

532
### Major changes
@@ -26,7 +53,7 @@ XML_PARSE_NOENT.
2653
Support for HTTP POST was removed.
2754

2855
Support for zlib, liblzma and HTTP is now disabled by default and has
29-
to be enabled by passing --with-zlib, --with-lzma or --with-html to
56+
to be enabled by passing --with-zlib, --with-lzma or --with-http to
3057
configure. In legacy mode (--with-legacy) these options are enabled
3158
by default as before.
3259

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
libxml2 Windows build with Visual Studio.
44

5-
This version is libxml2-2.13.0.
5+
This version is libxml2-2.13.1.
66

77
Note that LZMA support is only available for VS2013 or later.
88

‎THIS_VERSION_IS_2.13.0 ‎THIS_VERSION_IS_2.13.1

File renamed without changes.

‎distfiles/download.url

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.0.tar.xz
1+
https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.1.tar.xz

‎distfiles/libxml2-2.13.0.tar.xz

-2.46 MB
Binary file not shown.

‎distfiles/libxml2-2.13.0-import.lst ‎distfiles/libxml2-2.13.1-import.lst

File renamed without changes.

‎distfiles/libxml2-2.13.0-import.md5 ‎distfiles/libxml2-2.13.1-import.md5

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
f437ed9058e8e5135e47c01e973376ba Copyright
2-
16f41a2c516aa0db1295fd935164345c HTMLparser.c
2+
81f2881accbc601275df1d0f2885c135 HTMLparser.c
33
d04a2b2879cb84c5c3a195c2d444b335 HTMLtree.c
44
dd63184811cb2ff705c3e466364d3773 INSTALL
5-
516fcfeaa16a8f29342699b27202859d NEWS
5+
f3e85e6ed1d3dee747ccefcb42be5718 NEWS
66
5f32c16a4eccf442197b65fa65f3c7b8 README.libxml2.md
77
7283878f36a935a3c00df077cf45af54 SAX.c
88
4bb688a8949366334e6803484a0db05b SAX2.c
@@ -27,28 +27,28 @@ eeca649010f9bdc2a60b069766e030ab include/libxml/c14n.h
2727
63619fe1dbd8ae82c1040d7df0c7eb6e include/libxml/debugXML.h
2828
d00de0e505d1b4dfcccf9ff38837b61a include/libxml/dict.h
2929
8d3a048f503607ca9fbdc63bfa27d02e include/libxml/encoding.h
30-
8821188af2534b982d91cb73cf9a4c96 include/libxml/entities.h
30+
dfec1ac296aa8060e8556e7d122d375b include/libxml/entities.h
3131
bc51344e21f8d3b7f0fc93cc9d554243 include/libxml/globals.h
3232
637596e31cab013c73d81e02a31a5b65 include/libxml/hash.h
3333
90371c7017be1221a0c4d20089ade92a include/libxml/list.h
3434
d5c907a6d7d205e286168e007f32504c include/libxml/nanoftp.h
3535
95b1e4eadd008ebd16424f0f47213062 include/libxml/nanohttp.h
36-
d863425ee6d4ffe90f7af8532d194095 include/libxml/parser.h
36+
731e8b4519b21e29136613b0f6c5d5b9 include/libxml/parser.h
3737
b0d1746c566f0a4e1c368d6b1f734564 include/libxml/parserInternals.h
3838
dfa0e955ce14744df32c8a050c5ee84a include/libxml/pattern.h
3939
d752e41ee40c2b028d0adb34ffc38810 include/libxml/relaxng.h
4040
853377a2dbf74e9b0d679dcfcc1859b9 include/libxml/schemasInternals.h
4141
7a163ee849171ffc2471a89704a33643 include/libxml/schematron.h
4242
84310bd67922e532329432f7ab04338c include/libxml/threads.h
43-
ab717587b70618c1482aaead02514ff5 include/libxml/tree.h
43+
965a1da577ff8126e00825c6c4be7489 include/libxml/tree.h
4444
d08bbbc90b3d1d31309fd93c9681390f include/libxml/uri.h
45-
6dc6a9c1e7a9c651d38e34f6b336c2fc include/libxml/valid.h
46-
cf36fb20efcb8e5ad770e1d7ac858910 include/libxml/xinclude.h
45+
986a33222b102677c2f07580a7ca9b46 include/libxml/valid.h
46+
f56a2156246c1eabc080d8c2f27d48b6 include/libxml/xinclude.h
4747
4c7ff0fcbc3595d38f47e41f703dbc61 include/libxml/xlink.h
48-
0971aca35e60af238343eb745771c0d5 include/libxml/xmlIO.h
48+
59b6841396e332b38f075694ac2db47d include/libxml/xmlIO.h
4949
78602d66c5db00b0deece2c56ab86d43 include/libxml/xmlautomata.h
5050
04fa9aa45df384fe962db1a14fb59553 include/libxml/xmlerror.h
51-
225d59fc76e039255b1c6aa3f15771b7 include/libxml/xmlexports.h
51+
dfd4234e18f823082d3d301f25cce375 include/libxml/xmlexports.h
5252
13b117b714ad87f0fb17d302d9580cf3 include/libxml/xmlmemory.h
5353
1dda0f8301c72cab8c0015a4f36d008f include/libxml/xmlmodule.h
5454
288e26a1a1b1e495a463ff90b7d243d7 include/libxml/xmlreader.h
@@ -86,8 +86,8 @@ cdbcf52ea11b6ee99454e3b9a3adeaac legacy.c
8686
62f33a8621e3442770fd15a540a7eba0 list.c
8787
040942573dbd47e7188991ab3c9c9a99 nanoftp.c
8888
4c676ca8672af9c242eab69fb9e2056f nanohttp.c
89-
cae11ea48cd0e72f5ce5b6fbc4c6636c parser.c
90-
3c13537789e87f0a1c8a6a54a943fa84 parserInternals.c
89+
776c4676d1903df60d19cd9c11e08ac4 parser.c
90+
f32e0c097c781ddc57b268169f83a320 parserInternals.c
9191
fc88d174a7b70de62c609c32ce3f55f8 pattern.c
9292
06b7f056c759cff032979e0075c5b318 relaxng.c
9393
371edae07b81c37668065294e77dedcd runsuite.c
@@ -105,19 +105,19 @@ ac0599e08f02704f5d7db1e36134248f testparser.c
105105
71ea68a83739869caba574c1725fba96 testrecurse.c
106106
d746403de87ca28dbb43a4a76e63a3d6 threads.c
107107
1bcb15667ab695cdd2cc8d5b1bc05169 timsort.h
108-
f4cb2dec0f55e6bd9c20dbd1ae562759 tree.c
108+
d94e4d3aee44c5a9c504f4b06e073e4e tree.c
109109
7be25cd62649ec06302c67a0dbdcccc7 uri.c
110110
e1828d328a36cd0eea27256123122946 valid.c
111111
8ab2045fb3bb5553449a93c85ebbb58a win32/config.h
112112
9ca0965eeabe09b4f8d9a1c6c5d8c3b0 win32/libxml2.rc
113-
9e1d1292d776b102e1ad735144d52e48 xinclude.c
113+
a9b815153157403c75b2c9abf687e97e xinclude.c
114114
0a034450d155e35ec8ba99ee2005b695 xlink.c
115-
e98f05954ecf94bbbf9438b995ff30bd xmlIO.c
115+
6fea46801cfbcfc142146f3bbf05a90b xmlIO.c
116116
28bb81f9966d3ec48c510dd56fa10b94 xmlcatalog.c
117117
7eeb0736114d53f08e4be4d611e579dd xmllint.c
118118
9a191c58eb3f035c795898caea8e689b xmlmemory.c
119119
9d8d0df11b80a714e97da726359977dc xmlmodule.c
120-
0e186abcab75a69ea5c5b144834a88b6 xmlreader.c
120+
adb85e00bf69885fdddf7fd16f5baf0e xmlreader.c
121121
fda6796d6766ba055664f2993eca5ed7 xmlregexp.c
122122
35a26cd93568987405da54e9279d1359 xmlsave.c
123123
7ad15c4a469cee12b90af8115dd76b5e xmlschemas.c

‎distfiles/libxml2-2.13.1.tar.xz

2.46 MB
Binary file not shown.

‎include/libxml/entities.h

+4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111
#ifndef __XML_ENTITIES_H__
1212
#define __XML_ENTITIES_H__
1313

14+
/** DOC_DISABLE */
1415
#include <libxml/xmlversion.h>
16+
#define XML_TREE_INTERNALS
1517
#include <libxml/tree.h>
18+
#undef XML_TREE_INTERNALS
19+
/** DOC_ENABLE */
1620

1721
#ifdef __cplusplus
1822
extern "C" {

‎include/libxml/parser.h

+4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
#ifndef __XML_PARSER_H__
1111
#define __XML_PARSER_H__
1212

13+
/** DOC_DISABLE */
1314
#include <libxml/xmlversion.h>
15+
#define XML_TREE_INTERNALS
1416
#include <libxml/tree.h>
17+
#undef XML_TREE_INTERNALS
1518
#include <libxml/dict.h>
1619
#include <libxml/hash.h>
1720
#include <libxml/valid.h>
@@ -24,6 +27,7 @@
2427
/* for compatibility */
2528
#include <libxml/SAX2.h>
2629
#include <libxml/threads.h>
30+
/** DOC_ENABLE */
2731

2832
#ifdef __cplusplus
2933
extern "C" {

‎include/libxml/tree.h

+11
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
* Author: Daniel Veillard
1010
*/
1111

12+
#ifndef XML_TREE_INTERNALS
13+
14+
/*
15+
* Emulate circular dependency for backward compatibility
16+
*/
17+
#include <libxml/parser.h>
18+
19+
#else /* XML_TREE_INTERNALS */
20+
1221
#ifndef __XML_TREE_H__
1322
#define __XML_TREE_H__
1423

@@ -1369,3 +1378,5 @@ XML_DEPRECATED XMLPUBFUN int
13691378

13701379
#endif /* __XML_TREE_H__ */
13711380

1381+
#endif /* XML_TREE_INTERNALS */
1382+

‎include/libxml/valid.h

+4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
#ifndef __XML_VALID_H__
1212
#define __XML_VALID_H__
1313

14+
/** DOC_DISABLE */
1415
#include <libxml/xmlversion.h>
1516
#include <libxml/xmlerror.h>
17+
#define XML_TREE_INTERNALS
1618
#include <libxml/tree.h>
19+
#undef XML_TREE_INTERNALS
1720
#include <libxml/list.h>
1821
#include <libxml/xmlautomata.h>
1922
#include <libxml/xmlregexp.h>
23+
/** DOC_ENABLE */
2024

2125
#ifdef __cplusplus
2226
extern "C" {

‎include/libxml/xinclude.h

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#define __XML_XINCLUDE_H__
1515

1616
#include <libxml/xmlversion.h>
17+
#include <libxml/xmlerror.h>
1718
#include <libxml/tree.h>
1819

1920
#ifdef LIBXML_XINCLUDE_ENABLED

‎include/libxml/xmlIO.h

+4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
#ifndef __XML_IO_H__
1111
#define __XML_IO_H__
1212

13+
/** DOC_DISABLE */
1314
#include <stdio.h>
1415
#include <libxml/xmlversion.h>
1516
#include <libxml/encoding.h>
17+
#define XML_TREE_INTERNALS
1618
#include <libxml/tree.h>
19+
#undef XML_TREE_INTERNALS
20+
/** DOC_ENABLE */
1721

1822
#ifdef __cplusplus
1923
extern "C" {

‎include/libxml/xmlexports.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@
4141
* Attributes
4242
*/
4343

44-
#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
45-
#define ATTRIBUTE_UNUSED __attribute__((unused))
46-
#else
47-
#define ATTRIBUTE_UNUSED
44+
#ifndef ATTRIBUTE_UNUSED
45+
#if __GNUC__ * 100 + __GNUC_MINOR__ >= 207
46+
#define ATTRIBUTE_UNUSED __attribute__((unused))
47+
#else
48+
#define ATTRIBUTE_UNUSED
49+
#endif
4850
#endif
4951

5052
#if !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)

‎include/libxml/xmlversion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*
1616
* the version string like "1.2.3"
1717
*/
18-
#define LIBXML_DOTTED_VERSION "2.13.0"
18+
#define LIBXML_DOTTED_VERSION "2.13.1"
1919

2020
/**
2121
* LIBXML_VERSION:
2222
*
2323
* the version number: 1.2.3 value is 10203
2424
*/
25-
#define LIBXML_VERSION 21300
25+
#define LIBXML_VERSION 21301
2626

2727
/**
2828
* LIBXML_VERSION_STRING:
2929
*
3030
* the version number string, 1.2.3 value is "10203"
3131
*/
32-
#define LIBXML_VERSION_STRING "21300"
32+
#define LIBXML_VERSION_STRING "21301"
3333

3434
/**
3535
* LIBXML_VERSION_EXTRA:
@@ -44,7 +44,7 @@
4444
* Macro to check that the libxml version in use is compatible with
4545
* the version the software has been compiled against
4646
*/
47-
#define LIBXML_TEST_VERSION xmlCheckVersion(21300);
47+
#define LIBXML_TEST_VERSION xmlCheckVersion(21301);
4848

4949
/**
5050
* LIBXML_THREAD_ENABLED:

0 commit comments

Comments
 (0)