1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

15240 Commits

Author SHA1 Message Date
Takuya Aramaki 5528df1a20 Fix TypeError message of setlocale() (#20625) 2025-12-06 18:06:19 +01:00
Ilija Tovilo f39ae2fc67 Fix warning on 8.5 2025-12-04 13:51:16 +01:00
Alexandre Daubois d74085bf8c Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373)
2025-12-04 09:11:52 +01:00
Alexandre Daubois 175548e868 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373)
2025-12-04 09:11:09 +01:00
Alexandre Daubois 77f2d12849 Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373) 2025-12-04 09:09:30 +01:00
Niels Dossche f622c3925b Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Tweak values for test on Windows (#20633)
2025-12-02 20:48:44 +01:00
Niels Dossche 881754ec1e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Tweak values for test on Windows (#20633)
2025-12-02 20:48:36 +01:00
Niels Dossche ad867ce651 Tweak values for test on Windows (#20633) 2025-12-02 20:48:24 +01:00
Niels Dossche 1279bc60e7 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20584: Information Leak of Memory
  Fix GH-20583: Stack overflow in http_build_query via deep structures
2025-11-28 18:39:50 +01:00
Niels Dossche 159a75c93c Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20584: Information Leak of Memory
  Fix GH-20583: Stack overflow in http_build_query via deep structures
2025-11-28 18:39:27 +01:00
Niels Dossche 8fe7930533 Fix GH-20584: Information Leak of Memory
The string added had uninitialized memory due to
php_read_stream_all_chunks() not moving the buffer position, resulting
in the same data always being overwritten instead of new data being
added to the end of the buffer.

Closes GH-20592.
2025-11-28 18:38:48 +01:00
Niels Dossche 292a7f73ba Fix GH-20583: Stack overflow in http_build_query via deep structures
Closes GH-20590.
2025-11-28 18:38:18 +01:00
Niels Dossche d13b5ebc08 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20286: use-after-destroy during userland stream_close()
2025-11-23 17:52:42 +01:00
Niels Dossche eb733a3127 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20286: use-after-destroy during userland stream_close()
2025-11-23 17:51:35 +01:00
Niels Dossche 27f17c3322 Fix GH-20286: use-after-destroy during userland stream_close()
Closes GH-20493.

Co-authored-by: David Carlier <devnexen@gmail.com>
2025-11-23 17:46:28 +01:00
Niels Dossche a0b918d3ee Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix memory leak in array_diff() with custom type checks
2025-11-08 22:42:26 +01:00
Niels Dossche 43b232a654 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix memory leak in array_diff() with custom type checks
2025-11-08 22:42:11 +01:00
Niels Dossche 80b731659a Fix memory leak in array_diff() with custom type checks
Closes GH-20428.
2025-11-08 22:41:44 +01:00
Ilija Tovilo 106432852b Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [skip ci] Avoid potential network port conflict in tests
2025-11-05 12:34:46 +01:00
Ilija Tovilo cbc3c1e03a Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Avoid potential network port conflict in tests
2025-11-05 12:34:21 +01:00
Ilija Tovilo 4cfc729ac7 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Avoid potential network port conflict in tests
2025-11-05 12:34:14 +01:00
Ilija Tovilo 004a3985e7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Avoid potential network port conflict in tests
2025-11-05 12:34:08 +01:00
Ilija Tovilo c2f4508198 [skip ci] Avoid potential network port conflict in tests
These tests:

- ext/standard/tests/network/udp4loop.phpt
- ext/sockets/tests/socket_create_listen.phpt
- ext/sockets/tests/socket_create_listen-win32.phpt

all use port 31338. socket_create_listen.phpt and its win32 variant are mutually
exclusive, so they can't conflict. While udp4loop.phpt tries multiple ports, the
other tests do not. If udp4loop.phpt runs first and socket_create_listen.phpt
starts before it ends, the port is still blocked. Bump the start port for
udp4loop.phpt to avoid conflicts.
2025-11-05 12:29:31 +01:00
Niels Dossche 0b974dd663 Fix GH-20201: AVIF images misdetected as HEIF after introducing HEIF support in getimagesize()
Closes GH-20234.
2025-10-29 22:52:18 +01:00
Gina Peter Banyard 9a1b8a785d Fix GH-20194: null offset deprecation not emitted for writes (#20238)
Based on a patch from @ndossche
2025-10-29 18:36:10 +00:00
Ilija Tovilo 76e26c6c3c Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Unparallelize imap
2025-10-28 00:49:32 +01:00
Ilija Tovilo fc1bc9c695 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Unparallelize imap
2025-10-28 00:49:26 +01:00
Ilija Tovilo 20654ce4c9 [skip ci] Unparallelize imap
It's removed for PHP 8.4 anyway, and still regularly causes "Mailbox already
exists" errors despite the flaky flag.
2025-10-28 00:48:19 +01:00
David Carlier d378dce3e9 Fix GH-20257: heap overflow on empty message in lf mode.
close GH-20258
2025-10-22 21:27:01 +01:00
Ilija Tovilo 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
Ilija Tovilo 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
Ilija Tovilo 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
Niels Dossche ff86c593a2 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix shm corruption with coercion in options of unserialize()
2025-10-13 21:45:27 +02:00
Niels Dossche 8389197768 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix shm corruption with coercion in options of unserialize()
2025-10-13 21:45:09 +02:00
Niels Dossche 88f8c5c0bb Fix shm corruption with coercion in options of unserialize()
Closes GH-20129.
2025-10-13 21:40:54 +02:00
Niels Dossche ff7e1e7105 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-19570: unable to fseek in /dev/zero and /dev/null
2025-10-06 18:16:48 +02:00
Niels Dossche 2edb369181 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-19570: unable to fseek in /dev/zero and /dev/null
2025-10-06 18:16:37 +02:00
Niels Dossche b7aeb0a69f Fix GH-19570: unable to fseek in /dev/zero and /dev/null
On Linux, these two character devices are exceptions in that they can be
seeked. Check their major/minor device number.

Co-authored-by: divinity76 <hans@loltek.net>
2025-10-06 18:16:16 +02:00
Alexandre Daubois b40e479e39 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-19926: reset internal pointer earlier while splicing array while COW violation flag is still set (#19929)
2025-10-06 16:53:45 +02:00
Alexandre Daubois 2cc4532865 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-19926: reset internal pointer earlier while splicing array while COW violation flag is still set (#19929)
2025-10-06 16:52:50 +02:00
Alexandre Daubois 64c1d43b68 Fix GH-19926: reset internal pointer earlier while splicing array while COW violation flag is still set (#19929) 2025-10-06 16:51:23 +02:00
Nicolas Grekas fc353966f3 Revert deprecation of __sleep and __wakeup (#19966) 2025-10-06 10:30:27 +02:00
Niels Dossche 1f809a55cf Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20043: array_unique assertion failure with RC1 array causing an exception on sort
2025-10-05 20:16:12 +02:00
Niels Dossche f2f84e36eb Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20043: array_unique assertion failure with RC1 array causing an exception on sort
2025-10-05 20:15:55 +02:00
Niels Dossche 4fed57e746 Fix GH-20043: array_unique assertion failure with RC1 array causing an exception on sort
The reason this happens is because the array_unique operation happens in-place
because the input array is RC1.
At one point during comparison an exception is thrown which will capture the
arguments in the backtrace, which will increment the refcount of the RC1 array
to 2. Then a modification happens after the throw on the RC2 array causing the
assertion failure.
We shouldn't try continue work after an exception happened during the sort.

Closes GH-20059.
2025-10-05 20:15:28 +02:00
Ilija Tovilo a48de0a057 Skip proc_open_multiplex.phpt on PPC runner 2025-10-03 23:12:46 +02:00
David Carlier 7760e43ad1 Merge branch 'PHP-8.4' into PHP-8.5 2025-10-02 12:31:59 +01:00
David Carlier 3193fe0728 Merge branch 'PHP-8.3' into PHP-8.4 2025-10-02 12:30:41 +01:00
David Carlier 175afc4085 Fix GH-19705: do not flush/write buffer on non writeable stream.
Co-authored-by: Jakub Zelenka <bukka@php.net>

close GH-19708
2025-10-02 12:28:36 +01:00
Niels Dossche 31fefe0e09 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-17345: Bug #35916 was not completely fixed
2025-10-01 11:50:12 +02:00