Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
ac0e4e6
Backport #90076 to 25.8: Fix a terminate for uncaught exception
robot-clickhouse Nov 19, 2025
f70f7a9
Fix min/max value in Iceberg writes
ianton-ru Dec 5, 2025
f5edc95
Backport #88157 to 25.8: fix(engines): validate GenerateRandom engine…
robot-clickhouse Dec 12, 2025
c3e2e2b
Backport #93273 to 25.8: Fix unused columns removal in presence of co…
robot-clickhouse Jan 5, 2026
9792ef7
Backport #93426 to 25.8: Fix overflow in `groupConcat` deserialisation
robot-clickhouse Jan 6, 2026
2f8fb7f
Update autogenerated version to 25.8.14.17 and contributors
robot-clickhouse Jan 6, 2026
481d006
Merge pull request #93400 from ClickHouse/backport/25.8/93273
novikd Jan 6, 2026
7d76445
Merge pull request #93470 from ClickHouse/backport/25.8/93426
rienath Jan 7, 2026
0a9ad73
Backport #93028 to 25.8: Fix segfault in `groupConcat` merge with mal…
robot-clickhouse Jan 7, 2026
1816f9d
Backport #93008 to 25.8: Fix possible hung on terminating background …
robot-clickhouse Jan 7, 2026
502189d
Merge pull request #93590 from ClickHouse/backport/25.8/93008
clickhouse-gh[bot] Jan 7, 2026
44b04ec
Backport #93498 to 25.8: Unflaky test_projection_rebuild_uses_only_re…
robot-clickhouse Jan 7, 2026
81b681b
Merge pull request #93640 from ClickHouse/backport/25.8/93498
clickhouse-gh[bot] Jan 8, 2026
856b718
Merge pull request #93557 from ClickHouse/backport/25.8/93028
rienath Jan 8, 2026
03d13e0
Backport #93602 to 25.8: Make sure that zookeeper is finalized on shu…
robot-clickhouse Jan 8, 2026
e8b88b5
Merge pull request #93685 from ClickHouse/backport/25.8/93602
clickhouse-gh[bot] Jan 8, 2026
eb7fb2e
Backport #93453 to 25.8: Add additional validations in JSON column
robot-clickhouse Jan 8, 2026
14114c9
Merge pull request #93698 from ClickHouse/backport/25.8/93453
clickhouse-gh[bot] Jan 8, 2026
46e2745
Backport #92583 to 25.8: Fix dynamic subcolumns resolution in column …
robot-clickhouse Jan 8, 2026
04da3ae
Backport #93410 to 25.8: Do not tie remote throttler's max sleep time…
robot-clickhouse Jan 8, 2026
d474768
Merge pull request #93737 from ClickHouse/backport/25.8/93410
clickhouse-gh[bot] Jan 8, 2026
c86db82
Backport #93695 to 25.8: Check `SHOW COLUMNS` permission in `merge` …
robot-clickhouse Jan 9, 2026
50e053f
Backport #93690 to 25.8: Validate that the decompressed buffer size i…
robot-clickhouse Jan 9, 2026
28a9c25
Adjust Qpl
Algunenano Jan 9, 2026
c65f454
Merge pull request #90417 from ClickHouse/backport/25.8/90076
nikitamikhaylov Jan 9, 2026
bd7f1b1
Merge pull request #93805 from ClickHouse/backport/25.8/93690
Algunenano Jan 9, 2026
222332d
Backport #87205 to 25.8: Fix reading subcolumns from a column with do…
robot-clickhouse Jan 9, 2026
cced1c6
Merge pull request #93796 from ClickHouse/backport/25.8/93695
kssenii Jan 12, 2026
102babe
Backport #93791 to 25.8: Fix support for Prometheus Remote Read protocol
robot-clickhouse Jan 12, 2026
8cc2a46
Backport #93612 to 25.8: Fix flaky test_disallow_concurrency
robot-clickhouse Jan 12, 2026
0ce3c94
Backport #92814 to 25.8: Fix "Failed to set file processing within 10…
robot-clickhouse Jan 12, 2026
a14568c
Merge pull request #93845 from ClickHouse/backport/25.8/87205
Avogar Jan 12, 2026
c4ca09a
Remove broken test of deprecated Object
Avogar Jan 12, 2026
1d84f04
Merge pull request #93943 from ClickHouse/backport/25.8/93791
nikitamikhaylov Jan 12, 2026
f5d7a4c
Merge pull request #93964 from ClickHouse/25.8-broken-test
clickhouse-gh[bot] Jan 12, 2026
73c0dc4
Backport #93915 to 25.8: Fix exception message
robot-clickhouse Jan 12, 2026
d4f36ea
Backport #90326 to 25.8: Fix crash in randomStringUTF8
robot-clickhouse Jan 12, 2026
4bdb485
Merge pull request #94010 from ClickHouse/backport/25.8/90326
clickhouse-gh[bot] Jan 12, 2026
d38a4b5
Merge pull request #93951 from ClickHouse/backport/25.8/93612
pamarcos Jan 13, 2026
1f8b125
Merge branch '25.8' of github.com:ClickHouse/ClickHouse into backport…
Avogar Jan 14, 2026
d10084e
Backport #93715 to 25.8: Use AllocatorWithMemoryTracking for MarkRanges
robot-clickhouse Jan 14, 2026
e41536d
Backport #93619 to 25.8: Fix using Sparse column for TTL update
robot-clickhouse Jan 14, 2026
ccb97e4
Backport #94100 to 25.8: fix crash due to exception in `SCOPE_EXIT`
robot-clickhouse Jan 14, 2026
bcee0a1
Backport #94129 to 25.8: Forward c-ares to v1.34.6
robot-clickhouse Jan 14, 2026
2bbb605
Backport #94095 to 25.8: Fix accuracy of uniqTheta when using UInt8 a…
robot-clickhouse Jan 14, 2026
8d5188f
Backport #94180 to 25.8: Fix nullptr dereference in `PostgreSQL` data…
robot-clickhouse Jan 14, 2026
3390752
Merge pull request #94230 from ClickHouse/backport/25.8/94095
clickhouse-gh[bot] Jan 14, 2026
d82fc13
Merge pull request #94255 from ClickHouse/backport/25.8/94180
clickhouse-gh[bot] Jan 14, 2026
c12ee4a
Merge pull request #94223 from ClickHouse/backport/25.8/94129
Algunenano Jan 15, 2026
1b9626b
Merge pull request #93987 from ClickHouse/backport/25.8/93915
kssenii Jan 15, 2026
925caab
Backport #94200 to 25.8: Fix memory leak in RMV
robot-clickhouse Jan 15, 2026
8811e67
Merge pull request #94311 from ClickHouse/backport/25.8/94200
clickhouse-gh[bot] Jan 15, 2026
35f3168
Merge pull request #94146 from ClickHouse/backport/25.8/93715
nikitamikhaylov Jan 15, 2026
b87aee2
Merge pull request #94147 from ClickHouse/backport/25.8/93619
Avogar Jan 15, 2026
ac16857
Merge pull request #93719 from ClickHouse/backport/25.8/92583
Avogar Jan 15, 2026
38a216a
Backport #94320 to 25.8: Fix obscure bug in ZooKeeper client on conne…
robot-clickhouse Jan 15, 2026
85b181e
Backport #94070 to 25.8: Fix bad check for typed paths in JSON
robot-clickhouse Jan 15, 2026
3c87c9f
Merge pull request #94161 from ClickHouse/backport/25.8/94100
mstetsyuk Jan 15, 2026
fe8183a
Merge pull request #94347 from ClickHouse/backport/25.8/94320
clickhouse-gh[bot] Jan 15, 2026
9243832
Backport #94363 to 25.8: Fix current metric FilesystemCacheSizeLimit
robot-clickhouse Jan 16, 2026
e78e97d
Backport #94262 to 25.8: Fix data race in `DataPartStorageOnDiskBase:…
robot-clickhouse Jan 16, 2026
29845e0
Backport #94058 to 25.8: Fix use-of-uninitialized-value in ReadWriteB…
robot-clickhouse Jan 16, 2026
f532adc
Backport #94386 to 25.8: Better ignore for global revokes on database…
robot-clickhouse Jan 16, 2026
324e8b2
Merge pull request #94459 from ClickHouse/backport/25.8/94386
pufit Jan 17, 2026
aef5644
Merge pull request #94440 from ClickHouse/backport/25.8/94262
alexey-milovidov Jan 17, 2026
41b6c6d
Merge pull request #94450 from ClickHouse/backport/25.8/94058
alexey-milovidov Jan 17, 2026
d9e923b
Backport #94093 to 25.8: Fix: integer overflow in Throttler
robot-clickhouse Jan 19, 2026
b817797
Merge pull request #94392 from ClickHouse/backport/25.8/94363
kssenii Jan 19, 2026
14e99a5
Merge pull request #93952 from ClickHouse/backport/25.8/92814
kssenii Jan 19, 2026
db1901c
Merge pull request #92032 from ClickHouse/backport/25.8/88157
thevar1able Jan 19, 2026
a4ee2f6
Merge pull request #94583 from ClickHouse/backport/25.8/94093
clickhouse-gh[bot] Jan 19, 2026
d9a6007
Backport #94123 to 25.8: Fix data loss when DROP PARTITION removes pa…
robot-clickhouse Jan 20, 2026
7a0b36c
Merge pull request #94634 from ClickHouse/backport/25.8/94123
clickhouse-gh[bot] Jan 20, 2026
6196a68
Update autogenerated version to 25.8.15.35 and contributors
robot-clickhouse Jan 21, 2026
b3db54e
Merge pull request #94355 from ClickHouse/backport/25.8/94070
Avogar Jan 21, 2026
96c6d0c
Backport #92076 to 25.8: Add additional checks for missing streams in…
robot-clickhouse Jan 21, 2026
b24114f
Backport #94605 to 25.8: Add support for SQL-defined named collection…
robot-clickhouse Jan 21, 2026
0fcf725
Update Configuration.cpp
pamarcos Jan 21, 2026
0292e89
Update Configuration.h
pamarcos Jan 21, 2026
9262269
Update BackupInfo.cpp
pamarcos Jan 21, 2026
8ca8c02
Update test.py
pamarcos Jan 21, 2026
c3a5247
Backport #93038 to 25.8: Proper handle sparse nullable columns in inn…
robot-clickhouse Jan 21, 2026
bdf432f
Backport #94725 to 25.8: Preserve constant index granularity (use_con…
robot-clickhouse Jan 22, 2026
4b3d973
Update Configuration.cpp
pamarcos Jan 22, 2026
fa7a650
Backport #94680 to 25.8: Fix incorrect RIGHT join result when using c…
robot-clickhouse Jan 22, 2026
18b1b14
Update tests/queries/0_stateless/03800_use_const_adaptive_granularity…
azat Jan 22, 2026
c2a9a3e
Backport #94617 to 25.8: Fix permission issues in BACKUP/RESTORE oper…
robot-clickhouse Jan 22, 2026
7d995d3
Update BackupsWorker.cpp
pamarcos Jan 22, 2026
1f533a4
Revert "Update BackupsWorker.cpp"
pamarcos Jan 22, 2026
6d640cb
Update BackupsWorker.cpp
pamarcos Jan 22, 2026
fb0c7b7
Update test.py
pamarcos Jan 22, 2026
7f820f2
Merge pull request #94819 from ClickHouse/backport/25.8/94617
clickhouse-gh[bot] Jan 22, 2026
042ca77
Update tests/queries/0_stateless/03800_use_const_adaptive_granularity…
azat Jan 22, 2026
ea5e694
Backport #94627 to 25.8: fix segfault in DeltaLakeMetadata::getFieldV…
robot-clickhouse Jan 22, 2026
c9713c4
Merge pull request #94727 from ClickHouse/backport/25.8/94605
pamarcos Jan 22, 2026
5184693
Merge pull request #94840 from ClickHouse/backport/25.8/94627
clickhouse-gh[bot] Jan 22, 2026
220df44
Merge pull request #94782 from ClickHouse/backport/25.8/94725
clickhouse-gh[bot] Jan 22, 2026
5cb3453
Backport #94855 to 25.8: Add index out of range check in advanced sha…
robot-clickhouse Jan 22, 2026
44d69c8
Merge pull request #94868 from ClickHouse/backport/25.8/94855
clickhouse-gh[bot] Jan 23, 2026
2f3f625
Merge pull request #94808 from ClickHouse/backport/25.8/94680
vdimir Jan 23, 2026
c5e7f1c
Merge pull request #94761 from ClickHouse/backport/25.8/93038
Avogar Jan 23, 2026
ec29a51
Update MergeTreeReaderWide.cpp
Avogar Jan 23, 2026
7a77edf
Backport #94600 to 25.8: Fix crash in `ActionsDAG` partial evaluation…
robot-clickhouse Jan 23, 2026
8921078
Backport #94742 to 25.8: Use `curl` 8.18.0
robot-clickhouse Jan 23, 2026
aecd130
Merge pull request #94722 from ClickHouse/backport/25.8/92076
clickhouse-gh[bot] Jan 23, 2026
15df1c4
Merge pull request #94926 from ClickHouse/backport/25.8/94600
clickhouse-gh[bot] Jan 23, 2026
7fa22b6
Merge pull request #94943 from ClickHouse/backport/25.8/94742
clickhouse-gh[bot] Jan 23, 2026
05322b3
Backport #95005 to 25.8: Revert "Preserve constant index granularity …
robot-clickhouse Jan 24, 2026
686acf3
Merge pull request #95037 from ClickHouse/backport/25.8/95005
clickhouse-gh[bot] Jan 24, 2026
d69c4eb
Backport #94852 to 25.8: Fix readonlyness of encrypted disks
robot-clickhouse Jan 24, 2026
a7f89f2
Backport #93500 to 25.8: Threshold for dirty allocator pages
robot-clickhouse Jan 26, 2026
38c0e86
Backport #94851 to 25.8: Fix use-of-uninitialized-value in `getURLHos…
robot-clickhouse Jan 26, 2026
4da1498
Merge pull request #95144 from ClickHouse/backport/25.8/93500
antonio2368 Jan 26, 2026
4c09543
Merge pull request #95148 from ClickHouse/backport/25.8/94851
clickhouse-gh[bot] Jan 26, 2026
0b4cce2
Apply suggestions from code review
azat Jan 26, 2026
f892702
Backport #94902 to 25.8: Run jemalloc dirty pages purging in a differ…
robot-clickhouse Jan 26, 2026
4b70912
Backport #94323 to 25.8: Fix function to subcolumns optimization not …
robot-clickhouse Jan 26, 2026
2c8120e
Merge pull request #95165 from ClickHouse/backport/25.8/94902
antonio2368 Jan 26, 2026
f6ff5a7
Backport #95189 to 25.8: Use `postgres` REL_18_1
robot-clickhouse Jan 27, 2026
c8d9f3c
Backport #95218 to 25.8: Use `libexpat` 2.7.3
robot-clickhouse Jan 27, 2026
6bd8b1e
Backport #95190 to 25.8: CI: BackportCI to check PR content is valid
robot-clickhouse Jan 27, 2026
9c3e124
Merge pull request #95269 from ClickHouse/backport/25.8/95190
clickhouse-gh[bot] Jan 27, 2026
89b32de
Backport #92777 to 25.8: Fix query parameter substitution in CREATE U…
robot-clickhouse Jan 27, 2026
69a1731
Update 03791_function_to_subcolumns_optimization_on_subcolumns.sql
Avogar Jan 27, 2026
86ec8ff
Merge pull request #95200 from ClickHouse/backport/25.8/94323
clickhouse-gh[bot] Jan 27, 2026
e84e135
Merge pull request #95238 from ClickHouse/backport/25.8/95189
thevar1able Jan 27, 2026
6165c55
Merge pull request #95251 from ClickHouse/backport/25.8/95218
thevar1able Jan 27, 2026
a0ef3e7
Backport #93779 to 25.8: Fix attaching Replicated DBs when the inters…
robot-clickhouse Jan 28, 2026
5f2321b
Merge pull request #95349 from ClickHouse/backport/25.8/93779
tuanpach Jan 28, 2026
f54dfc0
Merge pull request #95282 from ClickHouse/backport/25.8/92777
evillique Jan 28, 2026
63c3f5a
Backport #94966 to 25.8: query view log duration
robot-clickhouse Jan 28, 2026
44d2c8a
Merge pull request #95059 from ClickHouse/backport/25.8/94852
azat Jan 28, 2026
d42b4e6
Merge pull request #95432 from ClickHouse/backport/25.8/94966
clickhouse-gh[bot] Jan 28, 2026
9d3ef33
Backport #95356 to 25.8: Fix storage lifetime with distributed plan
robot-clickhouse Jan 29, 2026
11117b5
Merge pull request #91589 from ianton-ru/fix_icebereg_write_minmax
scanhex12 Jan 29, 2026
af12721
Merge branch 'backport/25.8/93827' into backport-93827-2
KochetovNicolai Jan 29, 2026
43e59e7
Merge pull request #95499 from ClickHouse/backport/25.8/95356
clickhouse-gh[bot] Jan 29, 2026
7366f3a
Backport #93659 to 25.8: Add a magnificent test for backups
robot-clickhouse Jan 29, 2026
df11cc6
Merge pull request #95527 from ClickHouse/backport/25.8/93659
clickhouse-gh[bot] Jan 29, 2026
d2c83d2
Backport #95470 to 25.8: Fix check for encrypted disks over plain_rew…
robot-clickhouse Jan 29, 2026
40701eb
Merge pull request #95559 from ClickHouse/backport/25.8/95470
clickhouse-gh[bot] Jan 29, 2026
9d5a8e4
Backport #95325 to 25.8: Mask password in logs and system tables for …
robot-clickhouse Jan 29, 2026
bd3994f
Fix build error
amosbird Jan 30, 2026
1e1b11a
Backport #95466 to 25.8: Avoid possible crash for distributed queries…
robot-clickhouse Jan 30, 2026
cfacd52
Merge pull request #95570 from ClickHouse/backport/25.8/95325
antaljanosbenjamin Jan 30, 2026
3950cf9
Fix test
amosbird Jan 30, 2026
ff72c30
Backport #94892 to 25.8: Fix crash in clearDirectory on concurrent re…
robot-clickhouse Jan 30, 2026
cca9124
Backport #94816 to 25.8: Fix incorrect monotonicity for `toWeek`, `to…
robot-clickhouse Jan 30, 2026
a970865
Merge pull request #95625 from ClickHouse/backport/25.8/94892
clickhouse-gh[bot] Jan 30, 2026
9b34e38
Merge pull request #95638 from ClickHouse/backport/25.8/94816
clickhouse-gh[bot] Jan 30, 2026
9dd9b68
Merge pull request #95588 from amosbird/cherrypick/25.8/93827
KochetovNicolai Jan 30, 2026
7b54cda
Merge pull request #95602 from ClickHouse/backport/25.8/95466
azat Jan 30, 2026
cb90c71
Backport #95664 to 25.8: Fix race between distributed DDL and droppin…
robot-clickhouse Jan 31, 2026
7938087
Merge pull request #95691 from ClickHouse/backport/25.8/95664
clickhouse-gh[bot] Feb 1, 2026
0bfea47
merge 25.8.16
zvonand Feb 17, 2026
56abcaa
fix build
zvonand Feb 17, 2026
6bc5d3c
Merge branch 'antalya-25.8' into rebase/antalya-25.8/v25.8.16
zvonand Feb 18, 2026
9ea569b
Merge pull request #96964 from ClickHouse/fix-flaky-03221-merge-profi…
alexey-milovidov Feb 15, 2026
fe3c233
Merge branch 'antalya-25.8' into rebase/antalya-25.8/v25.8.16
CarlosFelipeOR Feb 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/poco/Net/include/Poco/Net/SocketImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ namespace Net
bool _isBrokenTimeout;

static constexpr size_t THROTTLER_QUANTUM = 32 * 1024;
static constexpr size_t THROTTLER_MAX_BLOCK_NS = 20'000'000'000ull;
size_t _recvThrottlerBudget;
size_t _sndThrottlerBudget;
ThrottlerPtr _recvThrottler;
Expand Down
14 changes: 2 additions & 12 deletions base/poco/Net/src/SocketImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1073,12 +1073,7 @@ void SocketImpl::throttleSend(size_t length, bool blocking)
{
size_t amount = length < THROTTLER_QUANTUM ? THROTTLER_QUANTUM : length;
if (blocking)
{
if (_sndTimeout.totalMicroseconds() != 0) // Avoid throttling over socket send timeout
_sndThrottler->throttle(amount, _sndTimeout.totalMicroseconds() * 1000 / 2);
else
_sndThrottler->throttle(amount);
}
_sndThrottler->throttle(amount, THROTTLER_MAX_BLOCK_NS);
else
_sndThrottler->throttle(amount, 0);
_sndThrottlerBudget += amount;
Expand All @@ -1092,12 +1087,7 @@ void SocketImpl::throttleRecv(size_t length, bool blocking)
{
size_t amount = length < THROTTLER_QUANTUM ? THROTTLER_QUANTUM : length;
if (blocking)
{
if (_recvTimeout.totalMicroseconds() != 0) // Avoid throttling over socket receive timeout
_recvThrottler->throttle(amount, _recvTimeout.totalMicroseconds() * 1000 / 2);
else
_recvThrottler->throttle(amount);
}
_recvThrottler->throttle(amount, THROTTLER_MAX_BLOCK_NS);
else
_recvThrottler->throttle(amount, 0);
_recvThrottlerBudget += amount;
Expand Down
66 changes: 40 additions & 26 deletions base/poco/XML/include/Poco/XML/expat.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
Copyright (c) 2023 Hanno Böck <hanno@gentoo.org>
Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com>
Copyright (c) 2024 Taichi Haradaguchi <20001722@ymail.ne.jp>
Copyright (c) 2025 Matthew Fernandez <matthew.fernandez@gmail.com>
Licensed under the MIT license:

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to permit
Expand All @@ -42,21 +43,21 @@
*/

#ifndef Expat_INCLUDED
#define Expat_INCLUDED 1
# define Expat_INCLUDED 1

#include <stdlib.h>
#include "expat_external.h"
# include <stdlib.h>
# include "expat_external.h"

#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# endif

struct XML_ParserStruct;
typedef struct XML_ParserStruct *XML_Parser;

typedef unsigned char XML_Bool;
#define XML_TRUE ((XML_Bool)1)
#define XML_FALSE ((XML_Bool)0)
# define XML_TRUE ((XML_Bool)1)
# define XML_FALSE ((XML_Bool)0)

/* The XML_Status enum gives the possible return values for several
API functions. The preprocessor #defines are included so this
Expand All @@ -73,11 +74,11 @@ typedef unsigned char XML_Bool;
*/
enum XML_Status {
XML_STATUS_ERROR = 0,
#define XML_STATUS_ERROR XML_STATUS_ERROR
# define XML_STATUS_ERROR XML_STATUS_ERROR
XML_STATUS_OK = 1,
#define XML_STATUS_OK XML_STATUS_OK
# define XML_STATUS_OK XML_STATUS_OK
XML_STATUS_SUSPENDED = 2
#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
# define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
};

enum XML_Error {
Expand Down Expand Up @@ -276,7 +277,7 @@ XML_ParserCreate_MM(const XML_Char *encoding,

/* Prepare a parser object to be reused. This is particularly
valuable when memory allocation overhead is disproportionately high,
such as when a large number of small documnents need to be parsed.
such as when a large number of small documents need to be parsed.
All handlers are cleared from the parser, except for the
unknownEncodingHandler. The parser's external state is re-initialized
except for the values of ns and ns_triplets.
Expand Down Expand Up @@ -680,7 +681,7 @@ XMLPARSEAPI(void)
XML_SetUserData(XML_Parser parser, void *userData);

/* Returns the last value set by XML_SetUserData or NULL. */
#define XML_GetUserData(parser) (*(void **)(parser))
# define XML_GetUserData(parser) (*(void **)(parser))

/* This is equivalent to supplying an encoding argument to
XML_ParserCreate. On success XML_SetEncoding returns non-zero,
Expand Down Expand Up @@ -752,7 +753,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
XMLPARSEAPI(int)
XML_GetIdAttributeIndex(XML_Parser parser);

#ifdef XML_ATTR_INFO
# ifdef XML_ATTR_INFO
/* Source file byte offsets for the start and end of attribute names and values.
The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
file an attribute value of "blah" will yield:
Expand All @@ -773,7 +774,7 @@ typedef struct {
*/
XMLPARSEAPI(const XML_AttrInfo *)
XML_GetAttributeInfo(XML_Parser parser);
#endif
# endif

/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
detected. The last call to XML_Parse must have isFinal true; len
Expand Down Expand Up @@ -970,9 +971,9 @@ XMLPARSEAPI(const char *)
XML_GetInputContext(XML_Parser parser, int *offset, int *size);

/* For backwards compatibility with previous versions. */
#define XML_GetErrorLineNumber XML_GetCurrentLineNumber
#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
#define XML_GetErrorByteIndex XML_GetCurrentByteIndex
# define XML_GetErrorLineNumber XML_GetCurrentLineNumber
# define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
# define XML_GetErrorByteIndex XML_GetCurrentByteIndex

/* Frees the content model passed to the element declaration handler */
XMLPARSEAPI(void)
Expand Down Expand Up @@ -1032,7 +1033,10 @@ enum XML_FeatureEnum {
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
/* Added in Expat 2.6.0. */
XML_FEATURE_GE
XML_FEATURE_GE,
/* Added in Expat 2.7.2. */
XML_FEATURE_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT,
XML_FEATURE_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT,
/* Additional features must be added to the end of this enum. */
};

Expand All @@ -1045,7 +1049,7 @@ typedef struct {
XMLPARSEAPI(const XML_Feature *)
XML_GetFeatureList(void);

#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
# if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
/* Added in Expat 2.4.0 for XML_DTD defined and
* added in Expat 2.6.0 for XML_GE == 1. */
XMLPARSEAPI(XML_Bool)
Expand All @@ -1057,7 +1061,17 @@ XML_SetBillionLaughsAttackProtectionMaximumAmplification(
XMLPARSEAPI(XML_Bool)
XML_SetBillionLaughsAttackProtectionActivationThreshold(
XML_Parser parser, unsigned long long activationThresholdBytes);
#endif

/* Added in Expat 2.7.2. */
XMLPARSEAPI(XML_Bool)
XML_SetAllocTrackerMaximumAmplification(XML_Parser parser,
float maximumAmplificationFactor);

/* Added in Expat 2.7.2. */
XMLPARSEAPI(XML_Bool)
XML_SetAllocTrackerActivationThreshold(
XML_Parser parser, unsigned long long activationThresholdBytes);
# endif

/* Added in Expat 2.6.0. */
XMLPARSEAPI(XML_Bool)
Expand All @@ -1066,12 +1080,12 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
/* Expat follows the semantic versioning convention.
See https://semver.org
*/
#define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 7
#define XML_MICRO_VERSION 1
# define XML_MAJOR_VERSION 2
# define XML_MINOR_VERSION 7
# define XML_MICRO_VERSION 3

#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif

#endif /* not Expat_INCLUDED */
122 changes: 61 additions & 61 deletions base/poco/XML/include/Poco/XML/expat_external.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/

#ifndef Expat_External_INCLUDED
#define Expat_External_INCLUDED 1
# define Expat_External_INCLUDED 1

/* External API definitions */

Expand All @@ -64,12 +64,12 @@
compiled with the cdecl calling convention as the default since
system headers may assume the cdecl convention.
*/
#ifndef XMLCALL
# if defined(_MSC_VER)
# define XMLCALL __cdecl
# elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
# define XMLCALL __attribute__((cdecl))
# else
# ifndef XMLCALL
# if defined(_MSC_VER)
# define XMLCALL __cdecl
# elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
# define XMLCALL __attribute__((cdecl))
# else
/* For any platform which uses this definition and supports more than
one calling convention, we need to extend this definition to
declare the convention used on that platform, if it's possible to
Expand All @@ -80,86 +80,86 @@
pre-processor and how to specify the same calling convention as the
platform's malloc() implementation.
*/
# define XMLCALL
# endif
#endif /* not defined XMLCALL */
# define XMLCALL
# endif
# endif /* not defined XMLCALL */

#if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
# ifndef XML_BUILDING_EXPAT
# if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
# ifndef XML_BUILDING_EXPAT
/* using Expat from an application */

# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
# define XMLIMPORT __declspec(dllimport)
# if defined(_MSC_VER) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
# define XMLIMPORT __declspec(dllimport)
# endif

# endif
# endif /* not defined XML_STATIC */

# ifndef XML_ENABLE_VISIBILITY
# define XML_ENABLE_VISIBILITY 0
# endif
#endif /* not defined XML_STATIC */

#ifndef XML_ENABLE_VISIBILITY
# define XML_ENABLE_VISIBILITY 0
#endif

#if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
# define XMLIMPORT __attribute__((visibility("default")))
#endif
# if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
# define XMLIMPORT __attribute__((visibility("default")))
# endif

/* If we didn't define it above, define it away: */
#ifndef XMLIMPORT
# define XMLIMPORT
#endif

#if defined(__GNUC__) \
&& (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
# define XML_ATTR_MALLOC __attribute__((__malloc__))
#else
# define XML_ATTR_MALLOC
#endif

#if defined(__GNUC__) \
&& ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
#else
# define XML_ATTR_ALLOC_SIZE(x)
#endif

#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL

#ifdef __cplusplus
extern "C" {
#endif
# ifndef XMLIMPORT
# define XMLIMPORT
# endif

# if defined(__GNUC__) \
&& (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
# define XML_ATTR_MALLOC __attribute__((__malloc__))
# else
# define XML_ATTR_MALLOC
# endif

#ifdef XML_UNICODE_WCHAR_T
# ifndef XML_UNICODE
# define XML_UNICODE
# if defined(__GNUC__) \
&& ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
# else
# define XML_ATTR_ALLOC_SIZE(x)
# endif
# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"

# define XMLPARSEAPI(type) XMLIMPORT type XMLCALL

# ifdef __cplusplus
extern "C" {
# endif
#endif

#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
# ifdef XML_UNICODE_WCHAR_T
# ifndef XML_UNICODE
# define XML_UNICODE
# endif
# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"
# endif
# endif

# ifdef XML_UNICODE /* Information is UTF-16 encoded. */
# ifdef XML_UNICODE_WCHAR_T
typedef wchar_t XML_Char;
typedef wchar_t XML_LChar;
# else
# else
typedef unsigned short XML_Char;
typedef char XML_LChar;
# endif /* XML_UNICODE_WCHAR_T */
#else /* Information is UTF-8 encoded. */
# endif /* XML_UNICODE_WCHAR_T */
# else /* Information is UTF-8 encoded. */
typedef char XML_Char;
typedef char XML_LChar;
#endif /* XML_UNICODE */
# endif /* XML_UNICODE */

#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
# ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
typedef long long XML_Index;
typedef unsigned long long XML_Size;
#else
# else
typedef long XML_Index;
typedef unsigned long XML_Size;
#endif /* XML_LARGE_SIZE */
# endif /* XML_LARGE_SIZE */

#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif

#endif /* not Expat_External_INCLUDED */
Loading