1
0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Commit Graph

143873 Commits

Author SHA1 Message Date
Derick Rethans cdeb0694f4 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Upgrade timelib to 2022.16
2026-01-14 14:12:15 +00:00
Derick Rethans 9d4a1f0c7e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Upgrade timelib to 2022.16
2026-01-14 14:11:29 +00:00
Derick Rethans e208cd86b4 Upgrade timelib to 2022.16 2026-01-14 14:10:44 +00:00
Derick Rethans 771dbda6fb Updated to version 2025.3 (2025c) 2026-01-14 13:55:17 +00:00
Derick Rethans f1ed1e1d87 Empty merge
* PHP-8.4:
  Updated to version 2025.3 (2025c)
  Updated to version 2025.3 (2025c)
2026-01-14 13:55:17 +00:00
Derick Rethans 65e316e89c Updated to version 2025.3 (2025c) 2026-01-14 13:55:15 +00:00
Derick Rethans c42eedc088 Empty merge
* PHP-8.3:
  Updated to version 2025.3 (2025c)
2026-01-14 13:55:14 +00:00
Derick Rethans 2670c8646d Updated to version 2025.3 (2025c) 2026-01-14 13:55:08 +00:00
Máté Kocsis 48344c9f86 Reorganize ext/uri tests - equivalence (#20391) 2026-01-13 22:45:58 +01:00
Ilija Tovilo 07ab0302a0 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:58 +01:00
Ilija Tovilo 688d4e7072 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:53 +01:00
Ilija Tovilo c145f83f34 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:47 +01:00
Ilija Tovilo 648ad5be31 [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds 2026-01-13 16:10:35 +01:00
Tim Düsterhus 11ae6ad0be zend_language_parser: Backup / restore doc comment when parsing attributes (#20896)
Attributes may themselves contain elements which can have a doc comment on
their own (namely Closures). A doc comment before the attribute list is
generally understood as belonging to the symbol having the attributes.

Fixes php/php-src#20895.
2026-01-13 16:07:50 +01:00
Tim Düsterhus b757a5c73b [skip ci] Fix typo in NEWS 2026-01-13 15:22:29 +01:00
Ilija Tovilo c35e391b2d Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix leaked parent property default value
2026-01-13 13:09:23 +01:00
Ilija Tovilo 4bfaf549f6 Fix leaked parent property default value
Fixes OSS-Fuzz #474613951
Closes GH-20911
2026-01-13 13:08:39 +01:00
Arnaud Le Blanc cc21f5e095 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  NEWS
  Set default_object_handlers when registering internal enums
2026-01-13 12:36:31 +01:00
Arnaud Le Blanc b273fc7aca NEWS 2026-01-13 12:34:03 +01:00
Arnaud Le Blanc 075b6b85f6 Set default_object_handlers when registering internal enums
Internal enums can be cloned and compared, unlike user enums, because we didn't set default_object_handlers when registering internal enums.

Fix by setting default_object_handlers when registering internal enums.

Fixes GH-20914
Closes GH-20915
2026-01-13 12:32:52 +01:00
Niels Dossche c80ac797d4 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Add test for GH-20880 (#20919)
2026-01-12 22:45:43 +01:00
Niels Dossche 1052270001 Add test for GH-20880 (#20919)
Closes GH-20880.
2026-01-12 22:45:24 +01:00
Dmitry Stogov f7f0d228c2 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Update IR (#20916)
2026-01-12 21:23:52 +03:00
Dmitry Stogov 098b1f89bd Update IR (#20916)
IR commit: 40cd6ad28c376cf006c360f39d8aeff6d6e7bf78
2026-01-12 21:23:38 +03:00
Niels Dossche acad49cace Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix bug52820 test for new libcurl release
2026-01-12 18:47:57 +01:00
Niels Dossche 290ebf13e1 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix bug52820 test for new libcurl release
2026-01-12 18:47:51 +01:00
Niels Dossche 39da78f422 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix bug52820 test for new libcurl release
2026-01-12 18:47:45 +01:00
Niels Dossche 636f84adcf Fix bug52820 test for new libcurl release
Reference: GH-20910.
2026-01-12 18:47:33 +01:00
Niels Dossche a82a93d64e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20856: heap-use-after-free in SplDoublyLinkedList iterator when modifying during iteration
2026-01-11 20:43:12 +01:00
Niels Dossche 2a2e0e8128 Fix GH-20856: heap-use-after-free in SplDoublyLinkedList iterator when modifying during iteration
The element may be still in use in other places, so the linking pointers
should be kept consistent. If not consistent, the "move forward" code in
the sample test will read a stale, dangling pointer.

Closes GH-20885.
2026-01-11 20:42:25 +01:00
Ilija Tovilo 918dc2355e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix block_pass JMP[N]Z optimization
2026-01-11 14:56:05 +01:00
Ilija Tovilo f61b1fc036 Fix block_pass JMP[N]Z optimization
In the following optimization:

JMPZ(X,L1) JMP(L2) L1: -> JMPNZ(X,L2) NOP

L1 must not be followed by another block, so that it may safely be followed by
the block containing the JMPNZ. get_next_block() is used to verify L1 is the
direct follower. This function also skips empty blocks, including live, empty
target blocks, which will then implicitly follow the new follow block. This will
result in L1 being followed by two separate blocks, which is not possible.

Resolve this by get_next_block() stopping at target blocks.

Fixes OSS-Fuzz #472563272
Closes GH-20850
2026-01-11 14:55:23 +01:00
Ilija Tovilo 99aec78209 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix infinite loop in GC destructor fiber
2026-01-11 01:21:22 +01:00
Ilija Tovilo 6f6c9e35e8 Fix infinite loop in GC destructor fiber
zend_object_release(&fiber->std) may restart the fiber due to finally. Any
thrown exception must be remembered and unset so that the next fiber may
successfully start.

Fixes OSS-Fuzz #471533782
Closes GH-20884
2026-01-11 01:20:32 +01:00
Niels Dossche b18b11ee28 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20882: phar buildFromIterator breaks with missing base directory
2026-01-10 15:10:08 +01:00
Niels Dossche a6e0d8e359 Fix GH-20882: phar buildFromIterator breaks with missing base directory
Broke in f57526a07a because of changing a char*+size_t pair to
zend_string* (which can't handle NULL pointers in its macros).

Closes GH-20888.
2026-01-10 15:09:36 +01:00
Tim Düsterhus 1f3390283d Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  output: Fail starting to output buffer when the output layer is deactivated (#20846)
2026-01-10 14:38:27 +01:00
Tim Düsterhus b5d6377ada output: Fail starting to output buffer when the output layer is deactivated (#20846)
Fixes php/php-src#20837.
2026-01-10 14:37:52 +01:00
Niels Dossche 750c220550 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  fastcgi: Fix compile warning wrt safe_read() (#20887)
2026-01-10 10:49:51 +01:00
Niels Dossche 60b1f59081 fastcgi: Fix compile warning wrt safe_read() (#20887)
This shouldn't be const. Fixes the following warning:
```
warning: variable 'hdr' is uninitialized when passed as a const pointer argument here
      [-Wuninitialized-const-pointer]
 1054 |         if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
      |                             ^~~
```
2026-01-10 10:49:37 +01:00
David Carlier fb7a5712a6 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20840: crash on nested object with var_dump().
2026-01-09 18:14:05 +00:00
David Carlier 5d2456f974 Fix GH-20840: crash on nested object with var_dump().
mitigate it with stack check limit.

close GH-20843
2026-01-09 18:13:42 +00:00
Máté Kocsis eb1e22b1df Fix constant references inside parameter default values when generating the manual 2026-01-08 22:51:28 +01:00
Ilija Tovilo a5c7903fbb Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [skip ci] Mark bug69442.phpt (PTY test) as flaky
2026-01-08 12:27:13 +01:00
Ilija Tovilo 226f68b24f Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Mark bug69442.phpt (PTY test) as flaky
2026-01-08 12:27:06 +01:00
Ilija Tovilo 33c3e30ed6 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Mark bug69442.phpt (PTY test) as flaky
2026-01-08 12:27:00 +01:00
Ilija Tovilo 4f25ea88f0 [skip ci] Mark bug69442.phpt (PTY test) as flaky
See GH-20864
2026-01-08 12:26:20 +01:00
Frank Denis a04fa6c1f0 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ext/sodium: use correct constants and error messages (#20852)
2026-01-07 09:51:46 +01:00
Frank Denis 83f3d5d487 ext/sodium: use correct constants and error messages (#20852)
Fix copy-and-paste mistakes in the sodium extension.

crypto_scalarmult_BYTES and crypto_scalarmult_ristretto255_BYTES
have the same value, so behavior is unchanged.
2026-01-07 09:45:06 +01:00
Niels Dossche 171b52c98f Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20833: mb_str_pad() divide by zero if padding string is invalid in the encoding
2026-01-05 20:01:54 +01:00