6291f97c14
phar: Move code to avoid goto
2025-10-20 20:33:33 +02:00
0098f3efbc
phar: De-indent code
2025-10-20 20:32:59 +02:00
0805953bb0
phar: Restructure code to get rid of a goto
2025-10-20 20:32:59 +02:00
40b3f88426
phar: Avoid string duplication just for error message, use truncation formatting string ( #20229 )
2025-10-20 20:31:16 +02:00
45a50d0d68
phar: Remove pointless efree() ( #20232 )
...
`error` is NULL at this point, otherwise we couldn't have gotten and
*shouldn't* have gotten here in the first place.
2025-10-20 20:31:01 +02:00
5ce8a86ac7
Merge branch 'PHP-8.5'
...
* PHP-8.5:
Improve bug60602.phpt portability
2025-10-20 17:32:01 +02:00
9e9663782c
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
Improve bug60602.phpt portability
2025-10-20 17:31:53 +02:00
4289bda31c
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Improve bug60602.phpt portability
2025-10-20 17:31:41 +02:00
939b97219d
Improve bug60602.phpt portability
...
On NixOS we need to inherit the PATH variable so we can actually resolve the
location of ls.
Closes GH-20206
2025-10-20 17:22:37 +02:00
01e339d8b8
ext/tidy: Enable tidyOptGetCategory on Windows ( #20226 )
...
The tidy library on Windows has been updated to tidy-html5 5.6.0 which
provides tidyOptGetCategory() function and has the TidyInternalCategory
enumeration.
https://github.com/winlibs/libtidy
2025-10-20 14:52:46 +02:00
0a7695cd5a
Merge branch 'PHP-8.5'
...
* PHP-8.5:
PHP 8.5 | UPGRADING: fix entry about new grapheme $locale parameter (#20239 )
uri: Make uri_parser_rfc3986.h usable for external extensions (#20173 )
Fix missing deprecation message for default case statement followed by semicolon (#20172 )
2025-10-20 10:32:14 +02:00
3ac9efe415
uri: Make uri_parser_rfc3986.h usable for external extensions ( #20173 )
...
This header could not previously be used due to the `uriparser/Uri.h` include,
which is required for the struct definition. Since this struct is considered an
implementation detail, we can just make it opaque, preserving type safety, but
without allowing external users to touch its contents.
Fixes php/php-src#19868 .
2025-10-20 10:30:20 +02:00
1ef7abf2be
zend_long: Remove ZEND_LTOA() ( #20236 )
...
* zend_long: Remove `ZEND_LTOA()`
This macro is unsafe when the given buffer is too small, since `snprintf()`
returns the *required* length of the string if it would fit. Thus
unconditionally writing a NUL there might result in a out-of-bounds write.
* zend_long: Remove `ZEND_LTOA_BUF_LEN`
2025-10-20 08:36:41 +02:00
63e534d7ca
phar: Remove no-op bool casts ( #20227 )
...
The field in this struct is already a bool.
2025-10-19 23:29:08 +02:00
a29c5d6928
phar: Simplify phar_wrapper_stat() ( #20222 )
...
We can pass NULL instead of the error pointer, as we never use the value
of the error pointer anyway.
2025-10-19 23:03:18 +02:00
552c588d4f
Merge branch 'PHP-8.5'
...
* PHP-8.5:
Fix GH-19021: improve tidyOptGetCategory detection
2025-10-19 20:55:38 +02:00
c2523ed581
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
Fix GH-19021: improve tidyOptGetCategory detection
2025-10-19 20:54:55 +02:00
b5c4435567
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-19021: improve tidyOptGetCategory detection
2025-10-19 20:53:37 +02:00
ebbb1b4295
Fix GH-19021: improve tidyOptGetCategory detection
...
We now check both this symbol and TidyInternalCategory presence.
Co-authored-by: Peter Kokot <peterkokot@gmail.com >
2025-10-19 20:52:19 +02:00
0fcd0bec11
Merge branch 'PHP-8.5'
...
* PHP-8.5:
pdo: Fix scope for PDO mixins in pdo_hash_methods() (#20200 )
2025-10-19 14:14:02 +02:00
1cb166cbbb
pdo: Fix scope for PDO mixins in pdo_hash_methods() ( #20200 )
...
From what I see the incorrect scope is not observable in any other way. The
mixin methods are completely invisible to Reflection and a SQLite function
referring to a private method is still properly called as before.
Fixes php/php-src#20095 .
2025-10-19 14:13:54 +02:00
81fef09d01
Merge branch 'PHP-8.5'
...
* PHP-8.5:
pgsql: Fix memory leak when first string conversion fails
2025-10-18 23:59:54 +02:00
9282111d9f
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
pgsql: Fix memory leak when first string conversion fails
2025-10-18 23:59:48 +02:00
d992cd8315
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
pgsql: Fix memory leak when first string conversion fails
2025-10-18 23:59:41 +02:00
cf3b70d23c
pgsql: Fix memory leak when first string conversion fails
...
If the first string conversion fails, then i==0, but memory was still
allocated for `params`. However, we skip freeing `params` when i==0.
Closes GH-20213.
2025-10-18 23:59:15 +02:00
560a16fa19
phar: Fix potential double free on Windows ( #20211 )
...
Because the code no longer bails out, these variables shouldn't be freed
here as they're already freed by the caller.
This also simplifies the code.
Fixes nightly.
2025-10-18 23:58:20 +02:00
bd82e8d149
Merge branch 'PHP-8.5'
...
* PHP-8.5:
intl: Fix memory leak on error in locale_filter_matches()
2025-10-18 10:27:38 +02:00
bb3559b2b5
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
intl: Fix memory leak on error in locale_filter_matches()
2025-10-18 10:27:32 +02:00
7c79a916d6
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
intl: Fix memory leak on error in locale_filter_matches()
2025-10-18 10:26:51 +02:00
28ce1b04ef
intl: Fix memory leak on error in locale_filter_matches()
...
Closes GH-20207.
2025-10-18 10:26:19 +02:00
d4f3ae90d2
ext/intl: Do not register IntlNumberRangeFormatter on ICU 62 or lower ( #20197 )
2025-10-17 20:09:14 +01:00
72a18f863a
Merge branch 'PHP-8.5'
...
* PHP-8.5:
Fix test on 8.4+ (#20196 )
2025-10-17 09:12:28 +02:00
a5578810bd
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
Fix test on 8.4+ (#20196 )
2025-10-17 09:12:22 +02:00
a576a3d5d4
Fix test on 8.4+ ( #20196 )
...
* Fix test on 8.4+
* more fixes
* Fix include path
2025-10-17 09:12:10 +02:00
3ee2f442d2
phar: Get rid of last bailouts in phar_file_action() ( #20193 )
...
* phar: Get rid of last bailouts in phar_file_action()
Follow-up on GH-20190.
* [ci skip] Drop wrong comment
2025-10-17 08:12:25 +02:00
ade8e2d8cd
phar: Drop buggy redundant Windows-only check ( #20195 )
...
If the path contains '\' the path is duplicated and unixified.
In practice this is always true. And if it were not, we'd get a heap
corruption as the cleanup code assumes it is.
2025-10-17 08:09:42 +02:00
0ed7424a33
ext/intl: Fix build failure on ICU 62 caused by dateformat ( #20198 )
2025-10-17 05:55:29 +01:00
009cf303f9
Merge branch 'PHP-8.5'
...
* PHP-8.5:
[ci skip] Fail test temporarily
2025-10-17 00:10:19 +02:00
41a8b3cd1b
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
[ci skip] Fail test temporarily
2025-10-17 00:10:11 +02:00
6980d51f52
[ci skip] Fail test temporarily
2025-10-17 00:10:02 +02:00
be97470dfd
Merge branch 'PHP-8.5'
...
* PHP-8.5:
Fix test on 8.4+
2025-10-16 23:54:12 +02:00
6a572d7b0d
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
Fix test on 8.4+
2025-10-16 23:54:07 +02:00
1570f6a6b2
Fix test on 8.4+
2025-10-16 23:54:02 +02:00
fbac7a366f
phar: Get rid of bailouts in Phar::webPhar() ( #20190 )
...
Bailouts are bad because they stop the GC etc. They also hide leaks.
This makes the behaviour equivalent to exit(), as it's meant to stop
the request (which is why bailout was used).
We also have to fix some leaks that pop up then.
2025-10-16 23:01:41 +02:00
984416dde3
Merge branch 'PHP-8.5'
...
* PHP-8.5:
Fix GH-20122: getColumnMeta() for JSON-column in MySQL
2025-10-16 22:56:24 +02:00
02bd332040
Merge branch 'PHP-8.4' into PHP-8.5
...
* PHP-8.4:
Fix GH-20122: getColumnMeta() for JSON-column in MySQL
2025-10-16 22:56:17 +02:00
4fa45096a7
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-20122: getColumnMeta() for JSON-column in MySQL
2025-10-16 22:56:09 +02:00
94284df7b2
Fix GH-20122: getColumnMeta() for JSON-column in MySQL
...
While at it, also add VECTOR.
Closes GH-20143.
2025-10-16 22:55:17 +02:00
ad9c60f995
ext/phar: start refactoring phar_postprocess_ru_web()
2025-10-16 21:29:09 +01:00
3828b2426b
ext/phar: Refactor phar_create_default_stub()
2025-10-16 21:29:09 +01:00
Niels Dossche