gh-115399: Upgrade bundled libexpat to 2.6.0 (#115431) · python/cpython@4b2d178 (original) (raw)

`@@ -11,11 +11,13 @@

`

11

11

` Copyright (c) 2000-2005 Fred L. Drake, Jr. fdrake@users.sourceforge.net

`

12

12

` Copyright (c) 2001-2002 Greg Stein gstein@users.sourceforge.net

`

13

13

` Copyright (c) 2002-2016 Karl Waclawek karl@waclawek.net

`

14

``

`-

Copyright (c) 2016-2022 Sebastian Pipping sebastian@pipping.org

`

``

14

`+

Copyright (c) 2016-2024 Sebastian Pipping sebastian@pipping.org

`

15

15

` Copyright (c) 2016 Cristian Rodríguez crrodriguez@opensuse.org

`

16

16

` Copyright (c) 2016 Thomas Beutlich tc@tbeu.de

`

17

17

` Copyright (c) 2017 Rhodri James rhodri@wildebeest.org.uk

`

18

18

` Copyright (c) 2022 Thijs Schreijer thijs@thijsschreijer.nl

`

``

19

`+

Copyright (c) 2023 Hanno Böck hanno@gentoo.org

`

``

20

`+

Copyright (c) 2023 Sony Corporation / Snild Dolkow snild@sony.com

`

19

21

` Licensed under the MIT license:

`

20

22

``

21

23

` Permission is hereby granted, free of charge, to any person obtaining

`

`@@ -269,7 +271,7 @@ XML_ParserCreate_MM(const XML_Char *encoding,

`

269

271

`const XML_Memory_Handling_Suite *memsuite,

`

270

272

`const XML_Char *namespaceSeparator);

`

271

273

``

272

``

`-

/* Prepare a parser object to be re-used. This is particularly

`

``

274

`+

/* Prepare a parser object to be reused. This is particularly

`

273

275

` valuable when memory allocation overhead is disproportionately high,

`

274

276

` such as when a large number of small documnents need to be parsed.

`

275

277

` All handlers are cleared from the parser, except for the

`

`@@ -951,7 +953,7 @@ XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);

`

951

953

`XMLPARSEAPI(int)

`

952

954

`XML_GetCurrentByteCount(XML_Parser parser);

`

953

955

``

954

``

`-

/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets

`

``

956

`+

/* If XML_CONTEXT_BYTES is >=1, returns the input buffer, sets

`

955

957

` the integer pointed to by offset to the offset within this buffer

`

956

958

` of the current parse position, and sets the integer pointed to by size

`

957

959

` to the size of this buffer (the number of input bytes). Otherwise

`

`@@ -1025,7 +1027,9 @@ enum XML_FeatureEnum {

`

1025

1027

` XML_FEATURE_ATTR_INFO,

`

1026

1028

`/* Added in Expat 2.4.0. */

`

1027

1029

` XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,

`

1028

``

`-

XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT

`

``

1030

`+

XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,

`

``

1031

`+

/* Added in Expat 2.6.0. */

`

``

1032

`+

XML_FEATURE_GE

`

1029

1033

`/* Additional features must be added to the end of this enum. */

`

1030

1034

`};

`

1031

1035

``

`@@ -1038,23 +1042,29 @@ typedef struct {

`

1038

1042

`XMLPARSEAPI(const XML_Feature *)

`

1039

1043

`XML_GetFeatureList(void);

`

1040

1044

``

1041

``

`-

#ifdef XML_DTD

`

1042

``

`-

/* Added in Expat 2.4.0. */

`

``

1045

`+

#if XML_GE == 1

`

``

1046

`+

/* Added in Expat 2.4.0 for XML_DTD defined and

`

``

1047

`+

`

1043

1048

`XMLPARSEAPI(XML_Bool)

`

1044

1049

`XML_SetBillionLaughsAttackProtectionMaximumAmplification(

`

1045

1050

` XML_Parser parser, float maximumAmplificationFactor);

`

1046

1051

``

1047

``

`-

/* Added in Expat 2.4.0. */

`

``

1052

`+

/* Added in Expat 2.4.0 for XML_DTD defined and

`

``

1053

`+

`

1048

1054

`XMLPARSEAPI(XML_Bool)

`

1049

1055

`XML_SetBillionLaughsAttackProtectionActivationThreshold(

`

1050

1056

` XML_Parser parser, unsigned long long activationThresholdBytes);

`

1051

1057

`#endif

`

1052

1058

``

``

1059

`+

/* Added in Expat 2.6.0. */

`

``

1060

`+

XMLPARSEAPI(XML_Bool)

`

``

1061

`+

XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);

`

``

1062

+

1053

1063

`/* Expat follows the semantic versioning convention.

`

1054

``

`-

See http://semver.org.

`

``

1064

`+

See https://semver.org

`

1055

1065

`*/

`

1056

1066

`#define XML_MAJOR_VERSION 2

`

1057

``

`-

#define XML_MINOR_VERSION 5

`

``

1067

`+

#define XML_MINOR_VERSION 6

`

1058

1068

`#define XML_MICRO_VERSION 0

`

1059

1069

``

1060

1070

`#ifdef __cplusplus

`